@jrmc/adonis-attachment 3.3.0-beta.2 → 3.3.0-beta.3

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

@@ -0,0 +1,4 @@
+declare const _default: {
+    encode(pixels: Uint8ClampedArray, width: number, height: number, componentX: number, componentY: number): Promise<string>;
+};
+export default _default;

package/build/src/adapters/blurhash.js

@@ -0,0 +1,6 @@
+import { encode } from 'blurhash';
+export default {
+    async encode(pixels, width, height, componentX, componentY) {
+        return encode(pixels, width, height, componentX, componentY);
+    },
+};

package/build/src/attachments/attachment.js

@@ -129,6 +129,7 @@ export class Attachment extends AttachmentBase {
                     mimeType: v.mimeType,
                     meta: v.meta,
                     size: v.size,
+                    blurhash: v.blurhash,
                 };
             });
         }

package/build/src/converter_manager.js

@@ -1,8 +1,9 @@
+import logger from '@adonisjs/core/services/logger';
 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';
-import { encodeImageToBlurhash } from './utils/helpers.js';
+import { imageToBlurhash } from './utils/helpers.js';
 export class ConverterManager {
     #record;
     #attributeName;
@@ -20,11 +21,11 @@ export class ConverterManager {
         const id = this.#record.model.$attributes['id'];
         const data = {};
         if (this.#options.variants) {
-            for (const option of this.#options.variants) {
+            for await (const option of this.#options.variants) {
                 const converter = (await attachmentManager.getConverter(option));
                 if (attachments && converter) {
-                    for (let i = 0; i < attachments.length; i++) {
-                        const input = attachments[i].input;
+                    for await (const attachment of attachments) {
+                        const input = attachment.input;
                         const output = await converter.handle({
                             input,
                             options: converter.options,
@@ -32,10 +33,21 @@ export class ConverterManager {
                         if (output === undefined) {
                             throw new errors.E_CANNOT_PATH_BY_CONVERTER();
                         }
-                        const variant = await attachments[i].createVariant(option, output);
+                        const variant = await attachment.createVariant(option, output);
                         if (converter.options.blurhash) {
-                            const options = typeof converter.options.blurhash !== 'boolean' ? converter.options.blurhash : undefined;
-                            variant.blurhash = await encodeImageToBlurhash(variant.input, options);
+                            if ((typeof converter.options.blurhash !== 'boolean' &&
+                                converter.options.blurhash.enabled === true) ||
+                                converter.options.blurhash === true) {
+                                try {
+                                    const options = typeof converter.options.blurhash !== 'boolean'
+                                        ? converter.options.blurhash
+                                        : undefined;
+                                    variant.blurhash = await imageToBlurhash(variant.input, options);
+                                }
+                                catch (error) {
+                                    logger.error(error.message);
+                                }
+                            }
                         }
                         await attachmentManager.save(variant);
                     }
@@ -58,10 +70,10 @@ export class ConverterManager {
         });
         try {
             await trx.query().from(Model.table).where('id', id).update(data);
-            return await trx.commit();
+            return trx.commit();
         }
         catch (error) {
-            return await trx.rollback();
+            return trx.rollback();
         }
     }
 }

package/build/src/services/record_with_attachment.js

@@ -106,7 +106,7 @@ export default class Record {
          * For all properties Attachment
          * Launch async generation variants
          */
-        await Promise.allSettled(attachmentAttributeNames.map((name) => {
+        for await (const name of attachmentAttributeNames) {
             const record = this;
             attachmentManager.queue.push({
                 name: `${this.#model.constructor.name}-${name}`,
@@ -124,7 +124,7 @@ export default class Record {
                     }
                 },
             });
-        }));
+        }
     }
     async detach() {
         const attachmentAttributeNames = this.#getDirtyAttributeNamesOfAttachment();
@@ -214,7 +214,9 @@ export default class Record {
             const dirtyValue = this.#model.$dirty[name];
             const originalValue = this.#model.$original[name]; // if dirtyValue is null, check original type
             const isDirtyAttachment = dirtyValue instanceof Attachment ||
-                (Array.isArray(dirtyValue) && dirtyValue.every((item) => item instanceof Attachment) && dirtyValue.length);
+                (Array.isArray(dirtyValue) &&
+                    dirtyValue.every((item) => item instanceof Attachment) &&
+                    dirtyValue.length);
             const isOriginalAttachment = originalValue instanceof Attachment ||
                 (Array.isArray(originalValue) && originalValue.every((item) => item instanceof Attachment));
             return isDirtyAttachment || isOriginalAttachment;

package/build/src/types/converter.d.ts

@@ -24,8 +24,8 @@ export type ConverterAttributes = {
 };
 export type BlurhashOptions = {
     enabled: boolean;
-    componentX: number;
-    componentY: number;
+    componentX: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    componentY: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
 };
 type jpeg = {
     format: 'jpeg';

package/build/src/utils/helpers.d.ts

@@ -12,4 +12,4 @@ export declare function bufferToTempFile(input: Buffer): Promise<string>;
 export declare function streamToTempFile(input: NodeJS.ReadableStream): Promise<string>;
 export declare function downloadToTempFile(input: URL): Promise<string>;
 export declare function isBase64(str: string): boolean;
-export declare function encodeImageToBlurhash(input: Input, options?: BlurhashOptions): Promise<string>;
+export declare function imageToBlurhash(input: Input, options?: BlurhashOptions): Promise<string>;

package/build/src/utils/helpers.js

@@ -11,7 +11,7 @@ import fs from 'node:fs/promises';
 import { pipeline } from 'node:stream';
 import { promisify } from 'node:util';
 import { createWriteStream } from 'node:fs';
-import { encode } from 'blurhash';
+import BlurhashAdapter from '../adapters/blurhash.js';
 import * as errors from '../errors.js';
 const streamPipeline = promisify(pipeline);
 export function cleanObject(obj) {
@@ -92,7 +92,7 @@ export function isBase64(str) {
         return false;
     }
 }
-export function encodeImageToBlurhash(input, options) {
+export function imageToBlurhash(input, options) {
     const { componentX, componentY } = options || { componentX: 4, componentY: 4 };
     return new Promise(async (resolve, reject) => {
         try {
@@ -102,11 +102,10 @@ export function encodeImageToBlurhash(input, options) {
                 .raw()
                 .ensureAlpha()
                 .toBuffer({ resolveWithObject: true });
-            return resolve(encode(new Uint8ClampedArray(pixels), metadata.width, metadata.height, componentX, componentY));
+            const blurhash = BlurhashAdapter.encode(new Uint8ClampedArray(pixels), metadata.width, metadata.height, componentX, componentY);
+            return resolve(blurhash);
         }
         catch (error) {
-            console.log('--------------');
-            console.log(error);
             return reject(error);
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jrmc/adonis-attachment",
-  "version": "3.3.0-beta.2",
+  "version": "3.3.0-beta.3",
   "type": "module",
   "description": "Turn any field on your Lucid model to an attachment data type",
   "engines": {
@@ -96,6 +96,7 @@
     "luxon": "^3.5.0",
     "prettier": "^3.4.2",
     "sharp": "^0.33.5",
+    "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3",
     "vitepress": "^1.5.0"