@jrmc/adonis-attachment 5.0.0-beta.3 → 5.0.0-beta.6

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;IAqBF,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,7 +19,14 @@ 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');
-            const lock = await this.app.container.make('lock.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');
             }

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/adapters/poppler.js

@@ -85,7 +85,6 @@ export default class Poppler {
             if (metadata['creationdate']) {
                 const dateStr = metadata['creationdate'];
                 const date = DateTime.fromFormat(dateStr, 'EEE MMM dd HH:mm:ss yyyy z', { zone: 'UTC' });
-                console.log('Parsed date:', date.toISO());
                 if (date.isValid) {
                     creationDate = date.toFormat('yyyy-MM-dd\'T\'HH:mm:ss');
                 }

package/build/src/attachment_manager.d.ts

@@ -5,8 +5,8 @@
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
 import type { DriveService, SignedURLOptions } from '@adonisjs/drive/types';
-import type { LockService } from '@adonisjs/lock/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';
@@ -14,7 +14,6 @@ import Converter from './converters/converter.js';
 export declare class AttachmentManager<KnownConverters extends Record<string, Converter>> {
     #private;
     queue: DeferQueue;
-    lock: LockService;
     constructor(config: ResolvedAttachmentConfig<KnownConverters>, drive: DriveService, lock: LockService);
     createFromDbResponse(response?: string | JSON): AttachmentType | null;
     createFromFile(input: MultipartFile): Promise<AttachmentType>;
@@ -25,6 +24,10 @@ export declare class AttachmentManager<KnownConverters extends Record<string, Co
         getVariant(variantName: string): import("./types/attachment.js").Variant | null;
         getUrl(variantName?: string): Promise<string>;
         getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
+        preComputeUrl(): Promise<void>;
+        moveFileForDelete(): Promise<void>;
+        rollbackMoveFileForDelete(): Promise<void>;
+        remove(): Promise<void>;
         toObject(): AttachmentAttributes;
     })[]>;
     createFromPath(input: string, name?: string): Promise<AttachmentType>;
@@ -32,11 +35,12 @@ export declare class AttachmentManager<KnownConverters extends Record<string, Co
     createFromBase64(input: string, name?: string): Promise<AttachmentType>;
     createFromUrl(input: URL, name?: string): Promise<AttachmentType>;
     createFromStream(stream: NodeJS.ReadableStream, name?: string): Promise<AttachmentType>;
-    getConverter(key: string): Promise<void | Converter>;
     computeUrl(attachment: AttachmentType | AttachmentBase, signedUrlOptions?: SignedURLOptions): Promise<void>;
     preComputeUrl(attachment: AttachmentType): Promise<void>;
     write(attachment: AttachmentBase): Promise<void>;
     remove(attachment: AttachmentBase): Promise<void>;
+    get lock(): LockService;
     getConfig(): ResolvedAttachmentConfig<KnownConverters>;
+    getConverter(key: string): Promise<void | Converter>;
 }
 //# 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,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,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;IAGL,IAAI,EAAE,WAAW,CAAA;gBAEL,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;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,UAAU,CACd,UAAU,EAAE,cAAc,GAAG,cAAc,EAC3C,gBAAgB,CAAC,EAAE,gBAAgB;IAK/B,aAAa,CAAC,UAAU,EAAE,cAAc;IAIxC,KAAK,CAAC,UAAU,EAAE,cAAc;IAUhC,MAAM,CAAC,UAAU,EAAE,cAAc;IAMvC,IAAI,IAAI,gBAEP;IAED,SAAS;IAIH,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;CAuB3D"}

package/build/src/attachment_manager.js

@@ -17,10 +17,10 @@ export class AttachmentManager {
     queue;
     #config;
     #drive;
-    lock;
+    #lock;
     constructor(config, drive, lock) {
         this.#drive = drive;
-        this.lock = lock;
+        this.#lock = lock;
         this.#config = config;
         const concurrency = this.#config.queue?.concurrency || 1;
         this.queue = new DeferQueue({ concurrency });
@@ -96,71 +96,36 @@ export class AttachmentManager {
         const tmpPath = await streamToTempFile(stream);
         return this.createFromPath(tmpPath, name || path.basename(tmpPath));
     }
-    async getConverter(key) {
-        if (this.#config.converters) {
-            return this.#config.converters[key];
-        }
-    }
     async computeUrl(attachment, signedUrlOptions) {
-        const disk = attachment.getDisk();
-        const fileVisibility = await disk.getVisibility(attachment.path);
-        if (fileVisibility === 'private') {
-            attachment.url = await attachment.getSignedUrl(signedUrlOptions);
-        }
-        else {
-            attachment.url = await attachment.getUrl();
-        }
+        await attachment.computeUrl(signedUrlOptions);
     }
     async preComputeUrl(attachment) {
-        if (attachment.options?.preComputeUrl === false) {
-            return;
-        }
-        await this.computeUrl(attachment);
-        if (attachment instanceof Attachment && attachment.variants) {
-            for (const key in attachment.variants) {
-                if (Object.prototype.hasOwnProperty.call(attachment.variants, key)) {
-                    await this.computeUrl(attachment.variants[key]);
-                }
-            }
-        }
+        await attachment.preComputeUrl();
     }
     async write(attachment) {
-        const destinationPath = attachment.path;
         if (attachment.options?.meta) {
             attachment.meta = await ExifAdapter.exif(attachment.input, this.#config);
         }
         else {
             attachment.meta = undefined;
         }
-        if (Buffer.isBuffer(attachment.input)) {
-            await attachment.getDisk().put(destinationPath, attachment.input);
-        }
-        else if (attachment.input) {
-            await attachment.getDisk().copyFromFs(attachment.input, destinationPath);
-        }
+        await attachment.put();
     }
     async remove(attachment) {
-        if (attachment.path) {
-            await attachment.getDisk().delete(attachment.path);
-            if (attachment instanceof Attachment) {
-                if (attachment.variants) {
-                    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);
-                        }
-                    }
-                }
-            }
-        }
-        if (attachment.originalPath) {
-            await attachment.getDisk().delete(attachment.originalPath);
-        }
+        await attachment.remove();
+    }
+    // getters
+    get lock() {
+        return this.#lock;
     }
     getConfig() {
         return this.#config;
     }
+    async getConverter(key) {
+        if (this.#config.converters) {
+            return this.#config.converters[key];
+        }
+    }
     // private methods
     #configureAttachment(attachment) {
         if (this.#config.meta !== undefined) {

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

@@ -9,14 +9,11 @@ import type { AttachmentAttributes, Attachment as AttachmentInterface, LucidOpti
 import type { Input } from '../types/input.js';
 import { AttachmentBase } from './attachment_base.js';
 import { Variant } from './variant_attachment.js';
+import { LucidRow } from '@adonisjs/lucid/types/model';
 export declare class Attachment extends AttachmentBase implements AttachmentInterface {
     originalName: string;
     variants?: Variant[];
     constructor(drive: DriveService, attributes: AttachmentAttributes, input?: Input);
-    /**
-     * Getters
-     */
-    get name(): string;
     /**
      * Methods
      */
@@ -25,6 +22,14 @@ export declare class Attachment extends AttachmentBase implements AttachmentInte
     getUrl(variantName?: string): Promise<string>;
     getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
     setOptions(options: LucidOptions): this;
+    /**
+     * Actions
+     */
+    preComputeUrl(): Promise<void>;
+    makeName(record?: LucidRow, attributeName?: string): Promise<this>;
+    moveFileForDelete(): Promise<void>;
+    rollbackMoveFileForDelete(): Promise<void>;
+    remove(): Promise<void>;
     /**
      *
      */

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

@@ -1 +1 @@
-{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,oBAAoB,EACpB,UAAU,IAAI,mBAAmB,EACjC,YAAY,EACb,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAGjD,qBAAa,UAAW,SAAQ,cAAe,YAAW,mBAAmB;IAC3E,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;gBAER,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,KAAK;IAehF;;OAEG;IAEH,IAAI,IAAI,WAMP;IAED;;OAEG;IAEG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBhE,UAAU,CAAC,WAAW,EAAE,MAAM;IAIxB,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM;IAe3B,YAAY,CAChB,oBAAoB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAChD,gBAAgB,CAAC,EAAE,gBAAgB;IAyBrC,UAAU,CAAC,OAAO,EAAE,YAAY;IAkBhC;;OAEG;IAEH,QAAQ,IAAI,oBAAoB;IAUhC,MAAM,IAAI,MAAM;CAsCjB"}
+{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,oBAAoB,EACpB,UAAU,IAAI,mBAAmB,EACjC,YAAY,EACb,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAEtD,qBAAa,UAAW,SAAQ,cAAe,YAAW,mBAAmB;IAC3E,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;gBAER,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,KAAK;IAehF;;OAEG;IAEG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBhE,UAAU,CAAC,WAAW,EAAE,MAAM;IAIxB,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM;IAe3B,YAAY,CAChB,oBAAoB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAChD,gBAAgB,CAAC,EAAE,gBAAgB;IAyBrC,UAAU,CAAC,OAAO,EAAE,YAAY;IAkBhC;;OAEG;IAEG,aAAa;IAiBb,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM;IAIlD,iBAAiB;IAWjB,yBAAyB;IAWzB,MAAM;IAkBZ;;OAEG;IAEH,QAAQ,IAAI,oBAAoB;IAUhC,MAAM,IAAI,MAAM;CAsCjB"}

package/build/src/attachments/attachment.js

@@ -22,15 +22,6 @@ export class Attachment extends AttachmentBase {
             });
         }
     }
-    /**
-     * Getters
-     */
-    get name() {
-        if (this.options && this.options.rename === false) {
-            return this.originalName;
-        }
-        return super.name;
-    }
     /**
      * Methods
      */
@@ -107,6 +98,59 @@ export class Attachment extends AttachmentBase {
         }
         return this;
     }
+    /**
+     * Actions
+     */
+    async preComputeUrl() {
+        if (this.options?.preComputeUrl === false) {
+            return;
+        }
+        await this.computeUrl();
+        if (this.variants) {
+            for (const key in this.variants) {
+                if (Object.prototype.hasOwnProperty.call(this.variants, key)) {
+                    await this.computeUrl(this.variants[key]);
+                }
+            }
+        }
+    }
+    async makeName(record, attributeName) {
+        return super.makeName(record, attributeName, this.originalName);
+    }
+    async moveFileForDelete() {
+        if (this.options && this.options.rename !== true) {
+            const originalPath = this.path;
+            this.name = `${this.name}.trash`;
+            const trashPath = this.path;
+            this.originalPath = trashPath;
+            await this.getDisk().move(originalPath, trashPath);
+        }
+    }
+    async rollbackMoveFileForDelete() {
+        if (this.options && this.options.rename !== true) {
+            const trashPath = this.path;
+            this.name = this.name.replace('.trash', '');
+            const originalPath = this.path;
+            this.originalPath = originalPath;
+            await this.getDisk().move(trashPath, originalPath);
+        }
+    }
+    async remove() {
+        await super.remove();
+        if (this.variants) {
+            const variantPath = this.variants[0].folder;
+            try {
+                await this.getDisk().deleteAll(variantPath); // not compatible Minio, necessary for fs as not to leave an empty directory
+            }
+            catch (error) {
+                for (const key in this.variants) {
+                    if (Object.prototype.hasOwnProperty.call(this.variants, key)) {
+                        this.variants[key].remove();
+                    }
+                }
+            }
+        }
+    }
     /**
      *
      */

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

@@ -21,9 +21,10 @@ export declare class AttachmentBase implements AttachmentBaseInterface {
     options: LucidOptions;
     constructor(drive: DriveService, attributes: AttachmentBaseAttributes, input?: Input);
     /**
-     * Getters
+     * Getters / Setters
      */
     get name(): string;
+    set name(name: string);
     get folder(): string | undefined;
     get path(): string;
     /**
@@ -38,7 +39,15 @@ export declare class AttachmentBase implements AttachmentBaseInterface {
     getKeyId(): string | undefined;
     setKeyId(keyId: string): this;
     setOptions(options: LucidOptions): this;
-    makeFolder(record?: LucidRow): this;
+    /**
+     * Actions
+     */
+    computeUrl(signedUrlOptions?: SignedURLOptions): Promise<void>;
+    preComputeUrl(): Promise<void>;
+    makeName(record?: LucidRow, attributeName?: string, originalName?: string): Promise<this>;
+    makeFolder(record?: LucidRow): Promise<this>;
+    put(): Promise<void>;
+    remove(): Promise<void>;
     /**
      *
      */

package/build/src/attachments/attachment_base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_base.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment_base.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,IAAI,uBAAuB,EAC1C,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAOpD,qBAAa,cAAe,YAAW,uBAAuB;;IAC5D,KAAK,EAAE,YAAY,CAAA;IAEnB,KAAK,CAAC,EAAE,KAAK,CAAA;IAMb,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,YAAY,CAAA;gBAET,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,KAAK;IAsBpF;;OAEG;IAEH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAW/B;IAED,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED;;OAEG;IAEH,OAAO;IAIP,QAAQ;IAIF,SAAS;IAKf,SAAS;IAIT,MAAM;IAIN,YAAY,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IAIhD,QAAQ;IAIR,QAAQ,CAAC,KAAK,EAAE,MAAM;IAKtB,UAAU,CAAC,OAAO,EAAE,YAAY;IAQhC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ;IAwB5B;;OAEG;IAEH,QAAQ,IAAI,wBAAwB;IAYpC,MAAM,IAAI,MAAM;CAUjB"}
+{"version":3,"file":"attachment_base.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment_base.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,IAAI,uBAAuB,EAC1C,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAOpD,qBAAa,cAAe,YAAW,uBAAuB;;IAC5D,KAAK,EAAE,YAAY,CAAA;IAEnB,KAAK,CAAC,EAAE,KAAK,CAAA;IAMb,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,YAAY,CAAA;gBAET,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,KAAK;IAsBpF;;OAEG;IAEH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAEpB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAW/B;IAED,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED;;OAEG;IAEH,OAAO;IAIP,QAAQ;IAIF,SAAS;IAKf,SAAS;IAIT,MAAM;IAIN,YAAY,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IAIhD,QAAQ;IAIR,QAAQ,CAAC,KAAK,EAAE,MAAM;IAKtB,UAAU,CAAC,OAAO,EAAE,YAAY;IAQhC;;OAEG;IAEG,UAAU,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IAW9C,aAAa;IAQb,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM;IAwBzE,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ;IAwB5B,GAAG;IAQH,MAAM;IASZ;;OAEG;IAEH,QAAQ,IAAI,wBAAwB;IAYpC,MAAM,IAAI,MAAM;CAUjB"}

package/build/src/attachments/attachment_base.js

@@ -41,11 +41,14 @@ export class AttachmentBase {
         this.drive = drive;
     }
     /**
-     * Getters
+     * Getters / Setters
      */
     get name() {
         return this.#name;
     }
+    set name(name) {
+        this.#name = name;
+    }
     get folder() {
         if (this.#folder) {
             return this.#folder;
@@ -99,9 +102,49 @@ export class AttachmentBase {
         };
         return this;
     }
-    makeFolder(record) {
+    /**
+     * Actions
+     */
+    async computeUrl(signedUrlOptions) {
+        const disk = this.getDisk();
+        const fileVisibility = await disk.getVisibility(this.path);
+        if (fileVisibility === 'private') {
+            this.url = await this.getSignedUrl(signedUrlOptions);
+        }
+        else {
+            this.url = await this.getUrl();
+        }
+    }
+    async preComputeUrl() {
+        if (this.options?.preComputeUrl === false) {
+            return;
+        }
+        await this.computeUrl();
+    }
+    async makeName(record, attributeName, originalName) {
+        if (typeof this.options.rename === 'function' && record) {
+            this.#name = (await this.options.rename(record, attributeName, originalName));
+        }
+        else if (originalName && this.options.rename === false) {
+            this.#name = originalName;
+        }
+        if (this.#name && record) {
+            const parameters = extractPathParameters(this.#name);
+            if (parameters) {
+                parameters.forEach((parameter) => {
+                    const attribute = record.$attributes[parameter];
+                    if (typeof attribute === 'string') {
+                        const name = string.slug(string.noCase(string.escapeHTML(attribute.toLowerCase())));
+                        this.#name = this.#name?.replace(`:${parameter}`, name);
+                    }
+                });
+            }
+        }
+        return this;
+    }
+    async makeFolder(record) {
         if (typeof this.options.folder === 'function' && record) {
-            this.#folder = this.options.folder(record);
+            this.#folder = (await this.options.folder(record));
         }
         else if (this.options.folder) {
             this.#folder = this.options.folder;
@@ -120,6 +163,20 @@ export class AttachmentBase {
         }
         return this;
     }
+    async put() {
+        if (Buffer.isBuffer(this.input)) {
+            await this.getDisk().put(this.path, this.input);
+        }
+        else if (this.input) {
+            await this.getDisk().copyFromFs(this.input, this.path);
+        }
+    }
+    async remove() {
+        await this.getDisk().delete(this.path);
+        if (this.originalPath) {
+            await this.getDisk().delete(this.originalPath);
+        }
+    }
     /**
      *
      */

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;AAoBtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAElC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,WAAW;CAgGhD"}
+{"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

@@ -3,8 +3,8 @@ 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 VariantGenerator from '../services/variant/variant_generator.js';
-import VariantPersister from '../services/variant/variant_persister.js';
+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();
@@ -56,37 +56,46 @@ export default class AttachmentsController {
             */
             if (!variant && format) {
                 const converter = (await attachmentManager.getConverter(format));
-                variant = await (new VariantGenerator()).generateVariant({
+                variant = await (new VariantGeneratorService()).generateVariant({
                     key: format,
                     attachment: currentAttachment,
                     converter
                 });
                 if (variant) {
-                    const variantPersister = new VariantPersister({
+                    const variantPersister = new VariantPersisterService({
                         id: data.id,
                         modelTable: data.model,
                         attributeName: data.attribute,
                         multiple
                     });
-                    await variantPersister.persist({ attachments: attachments ?? [currentAttachment], variants: [variant] });
+                    const attachmentsOrCurrent = attachments.length ? attachments : [currentAttachment];
+                    await variantPersister.persist({ attachments: attachmentsOrCurrent, variants: [variant] });
                 }
             }
             /*
             * 5. Get the stream
             */
-            let file;
+            let stream;
             let mimeType;
             if (variant) {
-                file = await variant.getStream();
+                stream = await variant.getStream();
                 mimeType = variant.mimeType;
             }
-            else {
-                file = await currentAttachment.getStream();
+            else if (currentAttachment) {
+                stream = await currentAttachment.getStream();
                 mimeType = currentAttachment.mimeType;
             }
-            const readable = Readable.from(file);
-            response.header('Content-Type', mimeType);
-            response.stream(readable);
+            /*
+            * 6. Return the stream
+            */
+            if (stream && mimeType) {
+                const readable = Readable.from(stream);
+                response.header('Content-Type', mimeType);
+                response.stream(readable);
+            }
+            else {
+                return response.notFound();
+            }
         });
     }
 }

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;IAsCvE;;OAEG;IACG,SAAS,CAAC,MAAM,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;CA+B3E"}

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

@@ -0,0 +1,66 @@
+/**
+ * @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(async (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]);
+                    }
+                }
+            }
+            await this.#moveForDeletion(attachments);
+            await 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
+     */
+    async #markForDeletion(attachments, record) {
+        await Promise.allSettled(attachments.map((attachment) => record.row.$attachments.detached.push(attachment)));
+    }
+    async #moveForDeletion(attachments) {
+        await Promise.allSettled(attachments.map((attachment) => attachment.moveFileForDelete()));
+    }
+}