@jrmc/adonis-attachment 5.0.0-beta.2 → 5.0.0-beta.4

package/build/index.d.ts

@@ -1,7 +1,6 @@
 import attachmentManager from './services/main.js';
 import RegenerateService from './services/regenerate_service.js';
 export { configure } from './configure.js';
-export { ConverterManager } from './src/converter_manager.js';
 export { Attachment } from './src/attachments/attachment.js';
 export { attachment } from './src/decorators/attachment.js';
 export { attachments } from './src/decorators/attachment.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,oBAAoB,CAAA;AAClD,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,oBAAoB,CAAA;AAClD,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAA"}

package/build/index.js

@@ -1,7 +1,6 @@
 import attachmentManager from './services/main.js';
 import RegenerateService from './services/regenerate_service.js';
 export { configure } from './configure.js';
-export { ConverterManager } from './src/converter_manager.js';
 export { Attachment } from './src/attachments/attachment.js';
 export { attachment } from './src/decorators/attachment.js';
 export { attachments } from './src/decorators/attachment.js';

package/build/providers/attachment_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_provider.d.ts","sourceRoot":"","sources":["../../providers/attachment_provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAiB,iBAAiB;QAChC,iBAAiB,EAAE,iBAAiB,CAAA;KACrC;CACF;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;KACzC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;;IAGzB,SAAS,CAAC,GAAG,EAAE,kBAAkB;gBAAvB,GAAG,EAAE,kBAAkB;IAE7C,QAAQ;IAoBF,IAAI;CAQX"}
+{"version":3,"file":"attachment_provider.d.ts","sourceRoot":"","sources":["../../providers/attachment_provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAM/D,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAiB,iBAAiB;QAChC,iBAAiB,EAAE,iBAAiB,CAAA;KACrC;CACF;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;KACzC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;;IAGzB,SAAS,CAAC,GAAG,EAAE,kBAAkB;gBAAvB,GAAG,EAAE,kBAAkB;IAE7C,QAAQ;IA4BF,IAAI;CAQX"}

package/build/providers/attachment_provider.js

@@ -6,6 +6,7 @@
  */
 import { configProvider } from '@adonisjs/core';
 import { RuntimeException } from '@poppinss/utils';
+import { verrou } from '../src/adapters/lock.js';
 export default class AttachmentProvider {
     app;
     #manager = null;
@@ -18,10 +19,18 @@ export default class AttachmentProvider {
             const attachmentConfig = this.app.config.get('attachment');
             const config = await configProvider.resolve(this.app, attachmentConfig);
             const drive = await this.app.container.make('drive.manager');
+            let lock;
+            try {
+                const lockManager = await this.app.container.make('lock.manager');
+                lock = verrou(lockManager);
+            }
+            catch (error) {
+                lock = verrou();
+            }
             if (!config) {
                 throw new RuntimeException('Invalid config exported from "config/attachment.ts" file. Make sure to use the defineConfig method');
             }
-            this.#manager = new AttachmentManager(config, drive);
+            this.#manager = new AttachmentManager(config, drive, lock);
             return this.#manager;
         });
     }

package/build/services/regenerate_service.js

@@ -1,4 +1,4 @@
-import RecordWithAttachment from '../src/services/record_with_attachment.js';
+import { AttachmentRecordService } from '../src/services/attachment/index.js';
 export default class RegenerateService {
     #Model;
     #row;
@@ -15,13 +15,13 @@ export default class RegenerateService {
     }
     async run() {
         if (this.#row) {
-            const record = new RecordWithAttachment(this.#row);
+            const record = new AttachmentRecordService(this.#row);
             return record.regenerateVariants(this.#options);
         }
         else if (this.#Model) {
             const entities = await this.#Model.all();
             return Promise.all(entities.map(async (entity) => {
-                const record = new RecordWithAttachment(entity);
+                const record = new AttachmentRecordService(entity);
                 return record.regenerateVariants(this.#options);
             }));
         }

package/build/src/adapters/lock.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import type { LockService } from '../types/lock.js';
+export declare const verrou: (lock?: LockService) => LockService;
+//# sourceMappingURL=lock.d.ts.map

package/build/src/adapters/lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../../src/adapters/lock.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAKnD,eAAO,MAAM,MAAM,UAAW,WAAW,KAAG,WAW3C,CAAA"}

package/build/src/adapters/lock.js

@@ -0,0 +1,21 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import { Verrou } from '@verrou/core';
+import { memoryStore } from '@verrou/core/drivers/memory';
+export const verrou = (lock) => {
+    if (lock) {
+        return lock;
+    }
+    else {
+        return new Verrou({
+            default: 'memory',
+            stores: {
+                memory: { driver: memoryStore() }
+            }
+        });
+    }
+};

package/build/src/attachment_manager.d.ts

@@ -6,6 +6,7 @@
  */
 import type { DriveService, SignedURLOptions } from '@adonisjs/drive/types';
 import type { MultipartFile } from '@adonisjs/core/bodyparser';
+import type { LockService } from './types/lock.js';
 import type { AttachmentAttributes, AttachmentBase, Attachment as AttachmentType } from './types/attachment.js';
 import type { ResolvedAttachmentConfig } from './define_config.js';
 import { DeferQueue } from '@poppinss/defer';
@@ -13,14 +14,14 @@ import Converter from './converters/converter.js';
 export declare class AttachmentManager<KnownConverters extends Record<string, Converter>> {
     #private;
     queue: DeferQueue;
-    constructor(config: ResolvedAttachmentConfig<KnownConverters>, drive: DriveService);
+    constructor(config: ResolvedAttachmentConfig<KnownConverters>, drive: DriveService, lock: LockService);
     createFromDbResponse(response?: string | JSON): AttachmentType | null;
     createFromFile(input: MultipartFile): Promise<AttachmentType>;
     createFromFiles(inputs: MultipartFile[]): Promise<(AttachmentBase & {
         originalName: string;
         variants?: import("./types/attachment.js").Variant[];
         createVariant(key: string, input: import("./types/input.js").Input): Promise<import("./types/attachment.js").Variant>;
-        getVariant(variantName: string): import("./types/attachment.js").Variant | undefined;
+        getVariant(variantName: string): import("./types/attachment.js").Variant | null;
         getUrl(variantName?: string): Promise<string>;
         getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
         toObject(): AttachmentAttributes;
@@ -36,5 +37,6 @@ export declare class AttachmentManager<KnownConverters extends Record<string, Co
     write(attachment: AttachmentBase): Promise<void>;
     remove(attachment: AttachmentBase): Promise<void>;
     getConfig(): ResolvedAttachmentConfig<KnownConverters>;
+    get lock(): LockService;
 }
 //# sourceMappingURL=attachment_manager.d.ts.map

package/build/src/attachment_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_manager.d.ts","sourceRoot":"","sources":["../../src/attachment_manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,UAAU,IAAI,cAAc,EAC7B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,SAAS,MAAM,2BAA2B,CAAA;AAQjD,qBAAa,iBAAiB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;;IAC9E,KAAK,aAAA;gBAIO,MAAM,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,YAAY;IASlF,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAiBvC,cAAc,CAAC,KAAK,EAAE,aAAa;IAgBnC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE;;;;;;;;;IAIvC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAiB3C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAgB7C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAM7D,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAMpD,UAAU,CACd,UAAU,EAAE,cAAc,GAAG,cAAc,EAC3C,gBAAgB,CAAC,EAAE,gBAAgB;IAY/B,aAAa,CAAC,UAAU,EAAE,cAAc;IAgBxC,KAAK,CAAC,UAAU,EAAE,cAAc;IAgBhC,MAAM,CAAC,UAAU,EAAE,cAAc;IAuBvC,SAAS;CAqBV"}
+{"version":3,"file":"attachment_manager.d.ts","sourceRoot":"","sources":["../../src/attachment_manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,UAAU,IAAI,cAAc,EAC7B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,SAAS,MAAM,2BAA2B,CAAA;AAQjD,qBAAa,iBAAiB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;;IAC9E,KAAK,aAAA;gBAKO,MAAM,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW;IAUrG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAiBvC,cAAc,CAAC,KAAK,EAAE,aAAa;IAgBnC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE;;;;;;;;;IAIvC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAiB3C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAgB7C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAM7D,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAMpD,UAAU,CACd,UAAU,EAAE,cAAc,GAAG,cAAc,EAC3C,gBAAgB,CAAC,EAAE,gBAAgB;IAY/B,aAAa,CAAC,UAAU,EAAE,cAAc;IAgBxC,KAAK,CAAC,UAAU,EAAE,cAAc;IAgBhC,MAAM,CAAC,UAAU,EAAE,cAAc;IAyBvC,SAAS;IAIT,IAAI,IAAI,gBAEP;CAmBF"}

package/build/src/attachment_manager.js

@@ -17,8 +17,10 @@ export class AttachmentManager {
     queue;
     #config;
     #drive;
-    constructor(config, drive) {
+    #lock;
+    constructor(config, drive, lock) {
         this.#drive = drive;
+        this.#lock = lock;
         this.#config = config;
         const concurrency = this.#config.queue?.concurrency || 1;
         this.queue = new DeferQueue({ concurrency });
@@ -156,9 +158,13 @@ export class AttachmentManager {
             await attachment.getDisk().delete(attachment.originalPath);
         }
     }
+    // getters
     getConfig() {
         return this.#config;
     }
+    get lock() {
+        return this.#lock;
+    }
     // private methods
     #configureAttachment(attachment) {
         if (this.#config.meta !== undefined) {

package/build/src/attachments/attachment.d.ts

@@ -21,7 +21,7 @@ export declare class Attachment extends AttachmentBase implements AttachmentInte
      * Methods
      */
     createVariant(key: string, input: Input): Promise<Variant>;
-    getVariant(variantName: string): Variant | undefined;
+    getVariant(variantName: string): Variant | null;
     getUrl(variantName?: string): Promise<string>;
     getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
     setOptions(options: LucidOptions): this;

package/build/src/attachments/attachment.js

@@ -56,7 +56,7 @@ export class Attachment extends AttachmentBase {
         return variant;
     }
     getVariant(variantName) {
-        return this.variants?.find((v) => v.key === variantName);
+        return this.variants?.find((v) => v.key === variantName) ?? null;
     }
     async getUrl(variantName) {
         if (variantName) {

package/build/src/controllers/attachments_controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachments_controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/attachments_controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAkBtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAElC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,WAAW;CAkGhD"}
+{"version":3,"file":"attachments_controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/attachments_controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAoBtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAElC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,WAAW;CA0GhD"}

package/build/src/controllers/attachments_controller.js

@@ -1,92 +1,101 @@
 import path from 'node:path';
+import { Readable } from 'node:stream';
 import encryption from '@adonisjs/core/services/encryption';
 import db from '@adonisjs/lucid/services/db';
 import { attachmentManager } from '@jrmc/adonis-attachment';
-import { ConverterManager } from '../converter_manager.js';
-import { Readable } from 'node:stream';
+import VariantGeneratorService from '../services/variant/variant_generator_service.js';
+import VariantPersisterService from '../services/variant/variant_persister_service.js';
 export default class AttachmentsController {
     async handle({ request, response }) {
         const { key } = request.params();
         const format = request.qs()?.variant;
-        const index = request.qs()?.index;
-        let isAttachments = false;
+        let multiple = false;
         const data = encryption.decrypt(key);
-        const queryWithTableSelection = await db
-            .from(data.model)
-            .select(data.attribute)
-            .where('id', data.id).first();
-        /*
-        * 1. Get the entity
-        */
-        let result = JSON.parse(queryWithTableSelection[data.attribute]);
-        if (Array.isArray(result)) {
-            isAttachments = true;
-            result = result[index || 0];
-        }
-        result.folder = path.dirname(result.path);
-        /*
-        * 2. Get the attachment
-        */
-        const attachment = attachmentManager.createFromDbResponse(result);
-        attachment?.setOptions(data?.options);
-        if (!attachment) {
-            return response.notFound();
-        }
-        /*
-        * 3. Get the variant
-        */
-        const variant = attachment?.getVariant(format);
-        /*
-        * 4. Get the stream
-        * if variant and path, get the stream and return it
-        * if not, generate the variant
-        * if not, return the default file
-        */
-        if (!variant && format) {
-            let attachmentOrAttachmentsString;
-            const converter = (await attachmentManager.getConverter(format));
-            const variant = await ConverterManager.generate({
-                key: format,
-                attachment,
-                converter
-            });
-            if (isAttachments) {
-                attachmentOrAttachmentsString = JSON.stringify([attachment.toObject()]);
+        await attachmentManager.lock.createLock(`attachment.${data.model}-${data.attribute}`).run(async () => {
+            const queryWithTableSelection = await db
+                .from(data.model)
+                .select(data.attribute)
+                .where('id', data.id).first();
+            /*
+            * 1. Get the Attachment(s)
+            */
+            const result = JSON.parse(queryWithTableSelection[data.attribute]);
+            const attachments = [];
+            let currentAttachment = null;
+            if (Array.isArray(result)) {
+                multiple = true;
+                for (const item of result) {
+                    item.folder = path.dirname(item.path);
+                    const attachment = attachmentManager.createFromDbResponse(item);
+                    if (attachment) {
+                        attachment.setOptions(data.options);
+                        attachments.push(attachment);
+                    }
+                }
+                currentAttachment = attachments[data.index || 0];
             }
             else {
-                attachmentOrAttachmentsString = JSON.stringify(attachment.toObject());
+                result.folder = path.dirname(result.path);
+                currentAttachment = attachmentManager.createFromDbResponse(result);
+                if (currentAttachment) {
+                    currentAttachment.setOptions(data.options);
+                }
+            }
+            if (!currentAttachment) {
+                return response.notFound();
             }
-            const trx = await db.transaction();
-            trx.after('rollback', () => {
+            /*
+            * 2. Get the variant
+            */
+            let variant = currentAttachment.getVariant(format);
+            /*
+            * 3. Get the stream
+            * if variant and path, get the stream and return it
+            * if not, generate the variant
+            * if not, return the default file
+            */
+            if (!variant && format) {
+                const converter = (await attachmentManager.getConverter(format));
+                variant = await (new VariantGeneratorService()).generateVariant({
+                    key: format,
+                    attachment: currentAttachment,
+                    converter
+                });
                 if (variant) {
-                    attachmentManager.remove(variant);
+                    const variantPersister = new VariantPersisterService({
+                        id: data.id,
+                        modelTable: data.model,
+                        attributeName: data.attribute,
+                        multiple
+                    });
+                    const attachmentsOrCurrent = attachments.length ? attachments : [currentAttachment];
+                    await variantPersister.persist({ attachments: attachmentsOrCurrent, variants: [variant] });
                 }
-            });
-            try {
-                await trx.query().from(data.model).where('id', data.id).update({
-                    [data.attribute]: attachmentOrAttachmentsString
-                });
-                await trx.commit();
             }
-            catch (error) {
-                await trx.rollback();
+            /*
+            * 5. Get the stream
+            */
+            let stream;
+            let mimeType;
+            if (variant) {
+                stream = await variant.getStream();
+                mimeType = variant.mimeType;
+            }
+            else if (currentAttachment) {
+                stream = await currentAttachment.getStream();
+                mimeType = currentAttachment.mimeType;
+            }
+            /*
+            * 6. Return the stream
+            */
+            if (stream && mimeType) {
+                const readable = Readable.from(stream);
+                response.header('Content-Type', mimeType);
+                response.stream(readable);
+            }
+            else {
+                return response.notFound();
             }
-        }
-        /*
-        * 5. Get the stream
-        */
-        let file;
-        let mimeType;
-        if (variant) {
-            file = await variant.getStream();
-            mimeType = variant.mimeType;
-        }
-        else {
-            file = await attachment.getStream();
-            mimeType = attachment.mimeType;
-        }
-        const readable = Readable.from(file);
-        response.header('Content-Type', mimeType);
-        response.stream(readable);
+        });
     }
 }

package/build/src/decorators/attachment.d.ts

@@ -4,12 +4,12 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
-import type { LucidModel } from '@adonisjs/lucid/types/model';
+import type { LucidModel, LucidRow } from '@adonisjs/lucid/types/model';
 import type { LucidOptions } from '../types/attachment.js';
 import type { AttributeOfRowWithAttachment } from '../types/mixin.js';
 export declare const bootModel: (model: LucidModel & {
     $attachments: AttributeOfRowWithAttachment;
 }) => void;
-export declare const attachment: (options?: LucidOptions) => (target: any, attributeName: string) => void;
-export declare const attachments: (options?: LucidOptions) => (target: any, attributeName: string) => void;
+export declare const attachment: <T = LucidRow>(options?: LucidOptions<T>) => (target: any, attributeName: string) => void;
+export declare const attachments: <T = LucidRow>(options?: LucidOptions<T>) => (target: any, attributeName: string) => void;
 //# sourceMappingURL=attachment.d.ts.map

package/build/src/decorators/attachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/decorators/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAKtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAYrE,eAAO,MAAM,SAAS,UACb,UAAU,GAAG;IAClB,YAAY,EAAE,4BAA4B,CAAA;CAC3C,SA0BF,CAAA;AAyDD,eAAO,MAAM,UAAU,aAtBkD,YAAY,cACxD,GAAG,iBAAiB,MAAM,SAqBJ,CAAA;AACnD,eAAO,MAAM,WAAW,aAvBiD,YAAY,cACxD,GAAG,iBAAiB,MAAM,SAiCpD,CAAA"}
+{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/decorators/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAKtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAYrE,eAAO,MAAM,SAAS,UACb,UAAU,GAAG;IAClB,YAAY,EAAE,4BAA4B,CAAA;CAC3C,SA0BF,CAAA;AAyDD,eAAO,MAAM,UAAU,GAtBwC,CAAC,uBAAuB,YAAY,CAAC,CAAC,CAAC,cACzE,GAAG,iBAAiB,MAAM,SAqBJ,CAAA;AACnD,eAAO,MAAM,WAAW,GAvBuC,CAAC,uBAAuB,YAAY,CAAC,CAAC,CAAC,cACzE,GAAG,iBAAiB,MAAM,SAiCpD,CAAA"}

package/build/src/services/attachment/attachment_detachment_service.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import type { RecordWithAttachment as RecordWithAttachmentImplementation } from '../../types/service.js';
+export declare class AttachmentDetachmentService {
+    #private;
+    /**
+     * Detach dirty attachments (mark for deletion)
+     */
+    detach(record: RecordWithAttachmentImplementation): Promise<void>;
+    /**
+     * Detach all attachments (mark all for deletion)
+     */
+    detachAll(record: RecordWithAttachmentImplementation): Promise<void>;
+}
+//# sourceMappingURL=attachment_detachment_service.d.ts.map

package/build/src/services/attachment/attachment_detachment_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attachment_detachment_service.d.ts","sourceRoot":"","sources":["../../../../src/services/attachment/attachment_detachment_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,oBAAoB,IAAI,kCAAkC,EAAE,MAAM,wBAAwB,CAAA;AAIxG,qBAAa,2BAA2B;;IACtC;;OAEG;IACG,MAAM,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCvE;;OAEG;IACG,SAAS,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;CAyB3E"}

package/build/src/services/attachment/attachment_detachment_service.js

@@ -0,0 +1,64 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import { AttachmentUtils } from './attachment_utils.js';
+export class AttachmentDetachmentService {
+    /**
+     * Detach dirty attachments (mark for deletion)
+     */
+    async detach(record) {
+        const attachmentAttributeNames = AttachmentUtils.getDirtyAttributeNamesOfAttachment(record.row);
+        await Promise.allSettled(attachmentAttributeNames.map((name) => {
+            let attachments = [];
+            const options = AttachmentUtils.getOptionsByAttributeName(record.row, name);
+            if (record.row.$dirty[name] === null) {
+                attachments = AttachmentUtils.getOriginalAttachmentsByAttributeName(record.row, name);
+            }
+            else {
+                const originalAttachments = AttachmentUtils.getOriginalAttachmentsByAttributeName(record.row, name);
+                const newAttachments = AttachmentUtils.getAttachmentsByAttributeName(record.row, name);
+                /**
+                 * Clean Attachments changed
+                 */
+                for (let i = 0; i < originalAttachments.length; i++) {
+                    if (newAttachments.includes(originalAttachments[i])) {
+                        continue;
+                    }
+                    /**
+                     * If there was an existing file, then we must get rid of it
+                     */
+                    if (originalAttachments[i]) {
+                        originalAttachments[i].setOptions(options);
+                        attachments.push(originalAttachments[i]);
+                    }
+                }
+            }
+            this.#markForDeletion(attachments, record);
+        }));
+    }
+    /**
+     * Detach all attachments (mark all for deletion)
+     */
+    async detachAll(record) {
+        const attachmentAttributeNames = AttachmentUtils.getAttributeNamesOfAttachment(record.row);
+        await Promise.allSettled(attachmentAttributeNames.map((name) => {
+            const options = AttachmentUtils.getOptionsByAttributeName(record.row, name);
+            const attachments = AttachmentUtils.getAttachmentsByAttributeName(record.row, name);
+            for (let i = 0; i < attachments.length; i++) {
+                attachments[i].setOptions(options);
+            }
+            this.#markForDeletion(attachments, record);
+        }));
+    }
+    /**
+     * Mark attachments for deletion by adding them to detached array
+     */
+    #markForDeletion(attachments, record) {
+        for (let i = 0; i < attachments.length; i++) {
+            record.row.$attachments.detached.push(attachments[i]);
+        }
+    }
+}

package/build/src/services/attachment/attachment_persister_service.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import type { RecordWithAttachment as RecordWithAttachmentImplementation } from '../../types/service.js';
+export declare class AttachmentPersisterService {
+    /**
+     * Persist attachments before saving the row to the database
+     */
+    persistAttachments(record: RecordWithAttachmentImplementation): Promise<void>;
+    /**
+     * Pre-compute URLs for all attachments
+     */
+    preComputeUrls(record: RecordWithAttachmentImplementation): Promise<void>;
+    /**
+     * Set key IDs for all attachments using encryption
+     */
+    setKeyIds(record: RecordWithAttachmentImplementation): Promise<void>;
+}
+//# sourceMappingURL=attachment_persister_service.d.ts.map

package/build/src/services/attachment/attachment_persister_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attachment_persister_service.d.ts","sourceRoot":"","sources":["../../../../src/services/attachment/attachment_persister_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,oBAAoB,IAAI,kCAAkC,EAAE,MAAM,wBAAwB,CAAA;AAKxG,qBAAa,0BAA0B;IACrC;;OAEG;IACG,kBAAkB,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CnF;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/E;;OAEG;IACG,SAAS,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;CA4B3E"}

package/build/src/services/attachment/attachment_persister_service.js

@@ -0,0 +1,93 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import encryption from '@adonisjs/core/services/encryption';
+import attachmentManager from '../../../services/main.js';
+import { AttachmentUtils } from './attachment_utils.js';
+export class AttachmentPersisterService {
+    /**
+     * Persist attachments before saving the row to the database
+     */
+    async persistAttachments(record) {
+        const attachmentAttributeNames = AttachmentUtils.getDirtyAttributeNamesOfAttachment(record.row);
+        await Promise.all(attachmentAttributeNames.map(async (name) => {
+            const originalAttachments = AttachmentUtils.getOriginalAttachmentsByAttributeName(record.row, name);
+            const newAttachments = AttachmentUtils.getAttachmentsByAttributeName(record.row, name);
+            const options = AttachmentUtils.getOptionsByAttributeName(record.row, name);
+            /**
+             * Skip when the attachment attributeName hasn't been updated
+             */
+            if (!originalAttachments && !newAttachments) {
+                return;
+            }
+            /**
+             * memorise attribute name for generate variants
+             */
+            record.row.$attachments.dirtied.push(name);
+            for (let i = 0; i < newAttachments.length; i++) {
+                if (originalAttachments.includes(newAttachments[i])) {
+                    continue;
+                }
+                /**
+                 * If there is a new file and its local then we must save this
+                 * file.
+                 */
+                if (newAttachments[i]) {
+                    newAttachments[i].setOptions(options).makeFolder(record.row);
+                    record.row.$attachments.attached.push(newAttachments[i]);
+                    /**
+                     * Also write the file to the disk right away
+                     */
+                    await attachmentManager.write(newAttachments[i]);
+                }
+            }
+        }));
+    }
+    /**
+     * Pre-compute URLs for all attachments
+     */
+    async preComputeUrls(record) {
+        const attachmentAttributeNames = AttachmentUtils.getAttributeNamesOfAttachment(record.row);
+        await Promise.all(attachmentAttributeNames.map(async (name) => {
+            const options = AttachmentUtils.getOptionsByAttributeName(record.row, name);
+            if (record.row.$attributes[name]) {
+                const attachments = AttachmentUtils.getAttachmentsByAttributeName(record.row, name);
+                for (let i = 0; i < attachments.length; i++) {
+                    attachments[i].setOptions(options);
+                    await attachmentManager.preComputeUrl(attachments[i]);
+                }
+            }
+        }));
+    }
+    /**
+     * Set key IDs for all attachments using encryption
+     */
+    async setKeyIds(record) {
+        const attachmentAttributeNames = AttachmentUtils.getAttributeNamesOfAttachment(record.row);
+        await Promise.all(attachmentAttributeNames.map(async (name) => {
+            if (record.row.$attributes[name]) {
+                const attachments = AttachmentUtils.getAttachmentsByAttributeName(record.row, name);
+                for (let i = 0; i < attachments.length; i++) {
+                    const { disk, folder, meta, rename } = attachments[i].options;
+                    const model = record.row.constructor;
+                    const key = encryption.encrypt({
+                        model: model.table,
+                        id: record.row.$attributes['id'],
+                        attribute: name,
+                        index: i,
+                        options: {
+                            disk,
+                            folder,
+                            meta,
+                            rename
+                        }
+                    });
+                    attachments[i].setKeyId(key);
+                }
+            }
+        }));
+    }
+}