@forestadmin/plugin-aws-s3 1.2.5 → 1.3.1

package/dist/field/create-field.js

@@ -2,14 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const data_uri_1 = require("../utils/data-uri");
 function createField(collection, config) {
+    const dependencies = config.objectKeyFromRecord?.extraDependencies ?? [];
+    if (!dependencies.includes(config.sourcename)) {
+        dependencies.push(config.sourcename);
+    }
     collection.addField(config.filename, {
         columnType: 'String',
-        dependencies: [config.sourcename],
-        getValues: records => records.map(async (record) => {
-            const key = record[config.sourcename];
+        dependencies,
+        getValues: (records, context) => records.map(async (record) => {
+            let key = record[config.sourcename];
             if (!key) {
                 return null;
             }
+            key = config.objectKeyFromRecord?.mappingFunction
+                ? await config.objectKeyFromRecord.mappingFunction(record, context)
+                : key;
             if (config.readMode === 'proxy') {
                 return (0, data_uri_1.encodeDataUri)(await config.client.load(key));
             }
@@ -21,4 +28,4 @@ function createField(collection, config) {
     });
 }
 exports.default = createField;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWZpZWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpZWxkL2NyZWF0ZS1maWVsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLGdEQUFrRDtBQUVsRCxTQUF3QixXQUFXLENBQUMsVUFBZ0MsRUFBRSxNQUFxQjtJQUN6RixVQUFVLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUU7UUFDbkMsVUFBVSxFQUFFLFFBQVE7UUFDcEIsWUFBWSxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztRQUNqQyxTQUFTLEVBQUUsT0FBTyxDQUFDLEVBQUUsQ0FDbkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUMsTUFBTSxFQUFDLEVBQUU7WUFDekIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUV0QyxJQUFJLENBQUMsR0FBRyxFQUFFO2dCQUNSLE9BQU8sSUFBSSxDQUFDO2FBQ2I7WUFFRCxJQUFJLE1BQU0sQ0FBQyxRQUFRLEtBQUssT0FBTyxFQUFFO2dCQUMvQixPQUFPLElBQUEsd0JBQWEsRUFBQyxNQUFNLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7YUFDckQ7WUFFRCxJQUFJLE1BQU0sQ0FBQyxHQUFHLEtBQUssYUFBYSxJQUFJLE1BQU0sQ0FBQyxHQUFHLEtBQUssbUJBQW1CLEVBQUU7Z0JBQ3RFLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDeEM7WUFFRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLENBQUMsQ0FBQztLQUNMLENBQUMsQ0FBQztBQUNMLENBQUM7QUF2QkQsOEJBdUJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWZpZWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpZWxkL2NyZWF0ZS1maWVsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLGdEQUFrRDtBQUVsRCxTQUF3QixXQUFXLENBQUMsVUFBZ0MsRUFBRSxNQUFxQjtJQUN6RixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsbUJBQW1CLEVBQUUsaUJBQWlCLElBQUksRUFBRSxDQUFDO0lBRXpFLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRTtRQUM3QyxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztLQUN0QztJQUVELFVBQVUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRTtRQUNuQyxVQUFVLEVBQUUsUUFBUTtRQUNwQixZQUFZO1FBQ1osU0FBUyxFQUFFLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFDLE1BQU0sRUFBQyxFQUFFO1lBQ3pCLElBQUksR0FBRyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7WUFFcEMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDUixPQUFPLElBQUksQ0FBQzthQUNiO1lBRUQsR0FBRyxHQUFHLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSxlQUFlO2dCQUMvQyxDQUFDLENBQUMsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUMsZUFBZSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUM7Z0JBQ25FLENBQUMsQ0FBQyxHQUFHLENBQUM7WUFFUixJQUFJLE1BQU0sQ0FBQyxRQUFRLEtBQUssT0FBTyxFQUFFO2dCQUMvQixPQUFPLElBQUEsd0JBQWEsRUFBQyxNQUFNLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7YUFDckQ7WUFFRCxJQUFJLE1BQU0sQ0FBQyxHQUFHLEtBQUssYUFBYSxJQUFJLE1BQU0sQ0FBQyxHQUFHLEtBQUssbUJBQW1CLEVBQUU7Z0JBQ3RFLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDeEM7WUFFRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLENBQUMsQ0FBQztLQUNMLENBQUMsQ0FBQztBQUNMLENBQUM7QUFqQ0QsOEJBaUNDIn0=

package/dist/field/make-field-deleteable.js

@@ -1,9 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 async function deleteFiles(config, context) {
-    const records = await context.collection.list(context.filter, [config.sourcename]);
-    const keys = [...new Set(records.map(r => r[config.sourcename]).filter(path => !!path))];
-    await Promise.all(keys.map(k => config.client.delete(k)));
+    const projection = config.objectKeyFromRecord?.extraDependencies ?? [];
+    if (!projection.includes(config.sourcename)) {
+        projection.push(config.sourcename);
+    }
+    const records = await context.collection.list(context.filter, projection);
+    let keys;
+    if (config.objectKeyFromRecord?.mappingFunction) {
+        keys = await Promise.all(records.map(record => config.objectKeyFromRecord.mappingFunction(record, context)));
+    }
+    else {
+        keys = records.map(record => record[config.sourcename]);
+    }
+    const uniqueNonNull = [...new Set(keys.filter(path => !!path))];
+    if (uniqueNonNull.length > 0) {
+        await Promise.all(uniqueNonNull.map(k => config.client.delete(k)));
+    }
 }
 function makeFieldDeleteable(collection, config) {
     if (!config.deleteFiles)
@@ -18,4 +31,4 @@ function makeFieldDeleteable(collection, config) {
     });
 }
 exports.default = makeFieldDeleteable;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS1maWVsZC1kZWxldGVhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpZWxkL21ha2UtZmllbGQtZGVsZXRlYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU9BLEtBQUssVUFBVSxXQUFXLENBQ3hCLE1BQXFCLEVBQ3JCLE9BQTBEO0lBRTFELE1BQU0sT0FBTyxHQUFHLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ25GLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFekYsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUVELFNBQXdCLG1CQUFtQixDQUN6QyxVQUFnQyxFQUNoQyxNQUFxQjtJQUVyQixJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVc7UUFBRSxPQUFPO0lBRWhDLFVBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7UUFDckQsSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDM0MsV0FBVyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztTQUM5QjtJQUNILENBQUMsQ0FBQyxDQUFDO0lBRUgsVUFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBQyxPQUFPLEVBQUMsRUFBRTtRQUNyRCxXQUFXLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQy9CLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQWZELHNDQWVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS1maWVsZC1kZWxldGVhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpZWxkL21ha2UtZmllbGQtZGVsZXRlYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU9BLEtBQUssVUFBVSxXQUFXLENBQ3hCLE1BQXFCLEVBQ3JCLE9BQTBEO0lBRTFELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSxpQkFBaUIsSUFBSSxFQUFFLENBQUM7SUFFdkUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFO1FBQzNDLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0tBQ3BDO0lBRUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQzFFLElBQUksSUFBYyxDQUFDO0lBRW5CLElBQUksTUFBTSxDQUFDLG1CQUFtQixFQUFFLGVBQWUsRUFBRTtRQUMvQyxJQUFJLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLGVBQWUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FDbkYsQ0FBQztLQUNIO1NBQU07UUFDTCxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztLQUN6RDtJQUVELE1BQU0sYUFBYSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVoRSxJQUFJLGFBQWEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQzVCLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ3BFO0FBQ0gsQ0FBQztBQUVELFNBQXdCLG1CQUFtQixDQUN6QyxVQUFnQyxFQUNoQyxNQUFxQjtJQUVyQixJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVc7UUFBRSxPQUFPO0lBRWhDLFVBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7UUFDckQsSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDM0MsV0FBVyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztTQUM5QjtJQUNILENBQUMsQ0FBQyxDQUFDO0lBRUgsVUFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBQyxPQUFPLEVBQUMsRUFBRTtRQUNyRCxXQUFXLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQy9CLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQWZELHNDQWVDIn0=

package/dist/field/make-field-writable.js

@@ -1,10 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const data_uri_1 = require("../utils/data-uri");
-function getRecordId(collection, record) {
+function getPks(collection) {
     return Object.entries(collection.schema.fields)
         .filter(([, schema]) => schema.type === 'Column' && schema.isPrimaryKey)
-        .map(([name]) => record[name]);
+        .map(([name]) => name);
+}
+function computeProjection(collection, config) {
+    return [
+        ...new Set([
+            config.sourcename,
+            ...getPks(collection),
+            ...(config.objectKeyFromRecord?.extraDependencies ?? []), // extra deps
+        ]),
+    ];
 }
 function makeFieldWritable(collection, config) {
     const schema = collection.schema.fields[config.sourcename];
@@ -13,14 +22,30 @@ function makeFieldWritable(collection, config) {
     collection.replaceFieldWriting(config.filename, async (value, context) => {
         const patch = { [config.sourcename]: null };
         if (value) {
-            const recordId = getRecordId(collection, context.record).join('|');
             const file = (0, data_uri_1.parseDataUri)(value);
-            const key = config.storeAt(recordId, file.name);
-            await config.client.save(key, file, config.acl);
-            patch[config.sourcename] = key;
+            let record = null;
+            let recordId = null;
+            if (context.action === 'update') {
+                // On updates, we fetch the missing information from the database.
+                const pks = getPks(collection);
+                const projection = computeProjection(collection, config);
+                const records = await context.collection.list(context.filter || {}, projection);
+                // context.record is the patch coming from the frontend.
+                record = { ...(records?.[0] ?? {}), ...context.record };
+                recordId = pks.map(pk => record[pk]).join('|');
+            }
+            else {
+                // context.record is the record coming from the frontend.
+                record = { ...context.record };
+            }
+            patch[config.sourcename] = await config.storeAt(recordId, file.name, context);
+            // Update database and s3 bucket
+            await config.client.save(config.objectKeyFromRecord?.mappingFunction
+                ? await config.objectKeyFromRecord.mappingFunction({ ...record, ...patch }, context)
+                : patch[config.sourcename], file, config.acl);
         }
         return patch;
     });
 }
 exports.default = makeFieldWritable;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS1maWVsZC13cml0YWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maWVsZC9tYWtlLWZpZWxkLXdyaXRhYmxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBSUEsZ0RBQWlEO0FBRWpELFNBQVMsV0FBVyxDQUFDLFVBQWdDLEVBQUUsTUFBa0I7SUFDdkUsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1NBQzVDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksTUFBTSxDQUFDLFlBQVksQ0FBQztTQUN2RSxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztBQUNuQyxDQUFDO0FBRUQsU0FBd0IsaUJBQWlCLENBQ3ZDLFVBQWdDLEVBQ2hDLE1BQXFCO0lBRXJCLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQWlCLENBQUM7SUFDM0UsSUFBSSxNQUFNLENBQUMsVUFBVTtRQUFFLE9BQU87SUFFOUIsVUFBVSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN2RSxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDO1FBRTVDLElBQUksS0FBSyxFQUFFO1lBQ1QsTUFBTSxRQUFRLEdBQUcsV0FBVyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ25FLE1BQU0sSUFBSSxHQUFHLElBQUEsdUJBQVksRUFBQyxLQUFLLENBQUMsQ0FBQztZQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFFaEQsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNoRCxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEdBQUcsQ0FBQztTQUNoQztRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBckJELG9DQXFCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS1maWVsZC13cml0YWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maWVsZC9tYWtlLWZpZWxkLXdyaXRhYmxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBSUEsZ0RBQWlEO0FBRWpELFNBQVMsTUFBTSxDQUFDLFVBQWdDO0lBQzlDLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQztTQUM1QyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssUUFBUSxJQUFJLE1BQU0sQ0FBQyxZQUFZLENBQUM7U0FDdkUsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDM0IsQ0FBQztBQUVELFNBQVMsaUJBQWlCLENBQUMsVUFBZ0MsRUFBRSxNQUFxQjtJQUNoRixPQUFPO1FBQ0wsR0FBRyxJQUFJLEdBQUcsQ0FBQztZQUNULE1BQU0sQ0FBQyxVQUFVO1lBQ2pCLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQztZQUNyQixHQUFHLENBQUMsTUFBTSxDQUFDLG1CQUFtQixFQUFFLGlCQUFpQixJQUFJLEVBQUUsQ0FBQyxFQUFFLGFBQWE7U0FDeEUsQ0FBQztLQUNILENBQUM7QUFDSixDQUFDO0FBRUQsU0FBd0IsaUJBQWlCLENBQ3ZDLFVBQWdDLEVBQ2hDLE1BQXFCO0lBRXJCLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQWlCLENBQUM7SUFDM0UsSUFBSSxNQUFNLENBQUMsVUFBVTtRQUFFLE9BQU87SUFFOUIsVUFBVSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN2RSxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDO1FBRTVDLElBQUksS0FBSyxFQUFFO1lBQ1QsTUFBTSxJQUFJLEdBQUcsSUFBQSx1QkFBWSxFQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pDLElBQUksTUFBTSxHQUFlLElBQUksQ0FBQztZQUM5QixJQUFJLFFBQVEsR0FBVyxJQUFJLENBQUM7WUFFNUIsSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLFFBQVEsRUFBRTtnQkFDL0Isa0VBQWtFO2dCQUNsRSxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQy9CLE1BQU0sVUFBVSxHQUFHLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDekQsTUFBTSxPQUFPLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxJQUFJLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFFaEYsd0RBQXdEO2dCQUN4RCxNQUFNLEdBQUcsRUFBRSxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3hELFFBQVEsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2FBQ2hEO2lCQUFNO2dCQUNMLHlEQUF5RDtnQkFDekQsTUFBTSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUM7YUFDaEM7WUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLE1BQU0sTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztZQUU5RSxnQ0FBZ0M7WUFDaEMsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDdEIsTUFBTSxDQUFDLG1CQUFtQixFQUFFLGVBQWU7Z0JBQ3pDLENBQUMsQ0FBQyxNQUFNLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxHQUFHLEtBQUssRUFBRSxFQUFFLE9BQU8sQ0FBQztnQkFDcEYsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQzVCLElBQUksRUFDSixNQUFNLENBQUMsR0FBRyxDQUNYLENBQUM7U0FDSDtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBM0NELG9DQTJDQyJ9

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import type { CollectionCustomizer, DataSourceCustomizer } from '@forestadmin/datasource-customizer';
+import type { TCollectionName, TSchema } from '@forestadmin/datasource-customizer';
 import { File, Options } from './types';
 export { Options, File };
-export declare function createFileField(dataSource: DataSourceCustomizer, collection: CollectionCustomizer, options?: Options): Promise<void>;
+export declare function createFileField<S extends TSchema = TSchema, N extends TCollectionName<S> = TCollectionName<S>>(dataSource: any, collection: any, options?: Options<S, N>): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -30,6 +30,7 @@ async function createFileField(dataSource, collection, options) {
         readMode: options?.readMode ?? 'url',
         acl: options?.acl ?? 'private',
         storeAt: options?.storeAt ?? ((id, name) => `${collection.name}/${id}/${name}`),
+        objectKeyFromRecord: options?.objectKeyFromRecord || null,
     };
     (0, create_field_1.default)(collection, config);
     (0, make_field_writable_1.default)(collection, config);
@@ -40,4 +41,4 @@ async function createFileField(dataSource, collection, options) {
     (0, replace_field_1.default)(collection, config);
 }
 exports.createFileField = createFileField;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBS0Esd0VBQStDO0FBQy9DLDBGQUFnRTtBQUNoRSwwRkFBZ0U7QUFDaEUsc0ZBQTREO0FBQzVELHNGQUE0RDtBQUM1RCxzRkFBNEQ7QUFDNUQsMEVBQWlEO0FBRWpELG9EQUFnQztBQUl6QixLQUFLLFVBQVUsZUFBZSxDQUNuQyxVQUFnQyxFQUNoQyxVQUFnQyxFQUNoQyxPQUFpQjtJQUVqQixJQUFJLENBQUMsVUFBVTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0RBQWtELENBQUMsQ0FBQztJQUNyRixJQUFJLENBQUMsT0FBTztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQztJQUUzRCxNQUFNLFlBQVksR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFFakUsSUFBSSxDQUFDLFlBQVksSUFBSSxZQUFZLENBQUMsSUFBSSxLQUFLLFFBQVEsSUFBSSxZQUFZLENBQUMsVUFBVSxLQUFLLFFBQVEsRUFBRTtRQUMzRixNQUFNLEtBQUssR0FBRyxHQUFHLFVBQVUsQ0FBQyxJQUFJLElBQUksT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ3hELE1BQU0sSUFBSSxLQUFLLENBQUMsY0FBYyxLQUFLLHNDQUFzQyxDQUFDLENBQUM7S0FDNUU7SUFFRCxNQUFNLE1BQU0sR0FBRztRQUNiLFVBQVUsRUFBRSxPQUFPLENBQUMsU0FBUztRQUM3QixRQUFRLEVBQUUsR0FBRyxPQUFPLENBQUMsU0FBUyxRQUFRO1FBQ3RDLE1BQU0sRUFBRSxJQUFJLFlBQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDO1FBQy9CLFdBQVcsRUFBRSxPQUFPLEVBQUUsV0FBVyxJQUFJLEtBQUs7UUFDMUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxRQUFRLElBQUksS0FBSztRQUNwQyxHQUFHLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxTQUFTO1FBQzlCLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLElBQUksRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDO0tBQ2hGLENBQUM7SUFFRixJQUFBLHNCQUFXLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLElBQUEsNkJBQWlCLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLElBQUEsK0JBQW1CLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3hDLElBQUEsNkJBQWlCLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLElBQUEsK0JBQW1CLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3hDLElBQUEsNkJBQWlCLEVBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLElBQUEsdUJBQVksRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDbkMsQ0FBQztBQWhDRCwwQ0FnQ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUEsd0VBQStDO0FBQy9DLDBGQUFnRTtBQUNoRSwwRkFBZ0U7QUFDaEUsc0ZBQTREO0FBQzVELHNGQUE0RDtBQUM1RCxzRkFBNEQ7QUFDNUQsMEVBQWlEO0FBRWpELG9EQUFnQztBQUl6QixLQUFLLFVBQVUsZUFBZSxDQUduQyxVQUFVLEVBQUUsVUFBVSxFQUFFLE9BQXVCO0lBQy9DLElBQUksQ0FBQyxVQUFVO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO0lBQ3JGLElBQUksQ0FBQyxPQUFPO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO0lBRTNELE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUVqRSxJQUFJLENBQUMsWUFBWSxJQUFJLFlBQVksQ0FBQyxJQUFJLEtBQUssUUFBUSxJQUFJLFlBQVksQ0FBQyxVQUFVLEtBQUssUUFBUSxFQUFFO1FBQzNGLE1BQU0sS0FBSyxHQUFHLEdBQUcsVUFBVSxDQUFDLElBQUksSUFBSSxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDeEQsTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUFjLEtBQUssc0NBQXNDLENBQUMsQ0FBQztLQUM1RTtJQUVELE1BQU0sTUFBTSxHQUFHO1FBQ2IsVUFBVSxFQUFFLE9BQU8sQ0FBQyxTQUFTO1FBQzdCLFFBQVEsRUFBRSxHQUFHLE9BQU8sQ0FBQyxTQUFTLFFBQVE7UUFDdEMsTUFBTSxFQUFFLElBQUksWUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7UUFDL0IsV0FBVyxFQUFFLE9BQU8sRUFBRSxXQUFXLElBQUksS0FBSztRQUMxQyxRQUFRLEVBQUUsT0FBTyxFQUFFLFFBQVEsSUFBSSxLQUFLO1FBQ3BDLEdBQUcsRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLFNBQVM7UUFDOUIsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksSUFBSSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUM7UUFDL0UsbUJBQW1CLEVBQUUsT0FBTyxFQUFFLG1CQUFtQixJQUFJLElBQUk7S0FDMUQsQ0FBQztJQUVGLElBQUEsc0JBQVcsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDaEMsSUFBQSw2QkFBaUIsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdEMsSUFBQSwrQkFBbUIsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDeEMsSUFBQSw2QkFBaUIsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdEMsSUFBQSwrQkFBbUIsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDeEMsSUFBQSw2QkFBaUIsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdEMsSUFBQSx1QkFBWSxFQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUNuQyxDQUFDO0FBaENELDBDQWdDQyJ9

package/dist/types.d.ts

@@ -1,4 +1,7 @@
 /// <reference types="node" />
+import type { TCollectionName, TColumnName, TFieldName, TPartialSimpleRow, TSchema } from '@forestadmin/datasource-customizer';
+import type CollectionCustomizationContext from '@forestadmin/datasource-customizer/dist/context/collection-context';
+import type WriteCustomizationContext from '@forestadmin/datasource-customizer/dist/decorators/write/write-replace/context';
 import { ObjectCannedACL } from '@aws-sdk/client-s3';
 import Client from './utils/s3';
 export type File = {
@@ -13,14 +16,44 @@ export type File = {
  * It can be included in the global agent configuration under the "s3" key and overriden for
  * specific fields by using the "config" property on `AmazonS3File`.
  */
-export type Options = {
+export type Options<S extends TSchema = TSchema, N extends TCollectionName<S> = TCollectionName<S>> = {
     /** Name of the field that you want to use as a file-picker on the frontend */
-    fieldname: string;
+    fieldname: TColumnName<S, N>;
     /**
-     * Where should the file be stored on S3?
-     * Defaults to '<collection_name>/<field_name>/`.
+     * This function allows customizing the string that will be saved in the database.
+     * If the objectKeyFromRecord option is not set, the output of that function will also
+     * be used as the object key in S3.
+     *
+     * Note that the recordId parameter will _not_ be provided when records are created.
+     *
+     * Defaults to '<collection name>/<id>/<originalFilename>`.
+     *
+     * @example
+     * ```js
+     * storeAt: (recordId, originalFilename, context) => {
+     *   return `${context.collection.name}/${recordId ?? 'new-record'}/${originalFilename}`;
+     * }
+     * ```
      */
-    storeAt?: (recordId: string, originalFilename: string) => string;
+    storeAt?: (recordId: string, originalFilename: string, context: WriteCustomizationContext<S, N>) => string | Promise<string>;
+    /**
+     * This function allows customizing the object key that will be used in S3 without interfering
+     * with what is stored in the database.
+     *
+     * @example
+     * ```
+     * objectKeyFromRecord: {
+     *   extraDependencies: ['firstname', 'lastname'],
+     *   mappingFunction: (record, context) => {
+     *     return `avatars/${record.firstname}-${record.lastname}.png`;
+     *   }
+     * };
+     * ```
+     */
+    objectKeyFromRecord?: {
+        extraDependencies?: TFieldName<S, N>[];
+        mappingFunction: (record: TPartialSimpleRow<S, N>, context: CollectionCustomizationContext<S, N>) => string | Promise<string>;
+    };
     /** Either if old files should be deleted when updating or deleting a record. */
     deleteFiles?: boolean;
     /**
@@ -56,9 +89,9 @@ export type Options = {
         endpoint?: string;
     };
 };
-export type Configuration = Required<Pick<Options, 'acl' | 'deleteFiles' | 'readMode' | 'storeAt'> & {
+export type Configuration<S extends TSchema = TSchema, N extends TCollectionName<S> = TCollectionName<S>> = Required<Pick<Options<S, N>, 'acl' | 'deleteFiles' | 'readMode' | 'storeAt' | 'objectKeyFromRecord'> & {
     client: Client;
-    sourcename: string;
-    filename: string;
+    sourcename: TColumnName<S, N>;
+    filename: TColumnName<S, N>;
 }>;
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/plugin-aws-s3",
-  "version": "1.2.5",
+  "version": "1.3.1",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -16,7 +16,7 @@
     "@aws-sdk/s3-request-presigner": "^3.157.0"
   },
   "devDependencies": {
-    "@forestadmin/datasource-customizer": "1.9.3",
+    "@forestadmin/datasource-customizer": "1.10.1",
     "@forestadmin/datasource-toolkit": "1.5.1"
   },
   "files": [