@jrmc/adonis-attachment 6.0.0-alpha.2 → 6.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/commands/commands.json +1 -1
- package/build/commands/make/converter.d.ts +17 -0
- package/build/commands/make/converter.d.ts.map +1 -0
- package/build/commands/make/converter.js +27 -0
- package/build/commands/make/converter.js.map +1 -0
- package/build/index.d.ts +12 -6
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -5
- package/build/index.js.map +1 -1
- package/build/providers/attachment_provider.d.ts.map +1 -1
- package/build/providers/attachment_provider.js +20 -1
- package/build/providers/attachment_provider.js.map +1 -1
- package/build/services/converters.d.ts +10 -0
- package/build/services/converters.d.ts.map +1 -0
- package/build/services/converters.js +17 -0
- package/build/services/converters.js.map +1 -0
- package/build/src/adapters/adonis_drive_storage.d.ts.map +1 -1
- package/build/src/adapters/adonis_drive_storage.js +4 -1
- package/build/src/adapters/adonis_drive_storage.js.map +1 -1
- package/build/src/adapters/local_file_storage.d.ts.map +1 -1
- package/build/src/adapters/local_file_storage.js +9 -2
- package/build/src/adapters/local_file_storage.js.map +1 -1
- package/build/src/converters/autodetect_converter.d.ts +24 -0
- package/build/src/converters/autodetect_converter.d.ts.map +1 -0
- package/build/src/converters/autodetect_converter.js +113 -0
- package/build/src/converters/autodetect_converter.js.map +1 -0
- package/build/src/converters/configured_variant_converter_registry.d.ts +36 -0
- package/build/src/converters/configured_variant_converter_registry.d.ts.map +1 -0
- package/build/src/converters/configured_variant_converter_registry.js +81 -0
- package/build/src/converters/configured_variant_converter_registry.js.map +1 -0
- package/build/src/converters/converter.d.ts +148 -0
- package/build/src/converters/converter.d.ts.map +1 -0
- package/build/src/converters/converter.js +24 -0
- package/build/src/converters/converter.js.map +1 -0
- package/build/src/core/attachment.d.ts +7 -3
- package/build/src/core/attachment.d.ts.map +1 -1
- package/build/src/core/attachment.js +29 -4
- package/build/src/core/attachment.js.map +1 -1
- package/build/src/core/attachment_job_processor.d.ts +17 -1
- package/build/src/core/attachment_job_processor.d.ts.map +1 -1
- package/build/src/core/attachment_job_processor.js +81 -8
- package/build/src/core/attachment_job_processor.js.map +1 -1
- package/build/src/core/attachment_metadata_persister.d.ts +13 -0
- package/build/src/core/attachment_metadata_persister.d.ts.map +1 -0
- package/build/src/core/attachment_metadata_persister.js +8 -0
- package/build/src/core/attachment_metadata_persister.js.map +1 -0
- package/build/src/core/attachment_options.d.ts +3 -2
- package/build/src/core/attachment_options.d.ts.map +1 -1
- package/build/src/core/attachment_options.js.map +1 -1
- package/build/src/core/attachment_service.d.ts +24 -1
- package/build/src/core/attachment_service.d.ts.map +1 -1
- package/build/src/core/attachment_service.js +95 -4
- package/build/src/core/attachment_service.js.map +1 -1
- package/build/src/core/index.d.ts +9 -2
- package/build/src/core/index.d.ts.map +1 -1
- package/build/src/core/index.js +8 -2
- package/build/src/core/index.js.map +1 -1
- package/build/src/core/queue.d.ts +11 -1
- package/build/src/core/queue.d.ts.map +1 -1
- package/build/src/define_config.d.ts +27 -3
- package/build/src/define_config.d.ts.map +1 -1
- package/build/src/define_config.js +35 -1
- package/build/src/define_config.js.map +1 -1
- package/build/src/errors.d.ts +57 -0
- package/build/src/errors.d.ts.map +1 -0
- package/build/src/errors.js +96 -0
- package/build/src/errors.js.map +1 -0
- package/build/src/events/adonis_attachment_event_emitter.d.ts +17 -0
- package/build/src/events/adonis_attachment_event_emitter.d.ts.map +1 -0
- package/build/src/events/adonis_attachment_event_emitter.js +17 -0
- package/build/src/events/adonis_attachment_event_emitter.js.map +1 -0
- package/build/src/events/attachment_events.d.ts +43 -0
- package/build/src/events/attachment_events.d.ts.map +1 -0
- package/build/src/events/attachment_events.js +32 -0
- package/build/src/events/attachment_events.js.map +1 -0
- package/build/src/integrations/lucid/index.d.ts +1 -0
- package/build/src/integrations/lucid/index.d.ts.map +1 -1
- package/build/src/integrations/lucid/index.js +1 -0
- package/build/src/integrations/lucid/index.js.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.d.ts +3 -0
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.d.ts.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.js +7 -2
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.js.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.d.ts.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.js +4 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.js.map +1 -1
- package/build/src/integrations/lucid/models/attachment_link_model.d.ts.map +1 -1
- package/build/src/integrations/lucid/models/attachment_link_model.js +2 -1
- package/build/src/integrations/lucid/models/attachment_link_model.js.map +1 -1
- package/build/src/integrations/lucid/models/attachment_model.d.ts +3 -1
- package/build/src/integrations/lucid/models/attachment_model.d.ts.map +1 -1
- package/build/src/integrations/lucid/models/attachment_model.js +4 -0
- package/build/src/integrations/lucid/models/attachment_model.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.d.ts +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js +92 -35
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts +17 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts.map +1 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js +18 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js.map +1 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.js +5 -3
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.d.ts +5 -2
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.js +9 -3
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.js.map +1 -1
- package/build/src/integrations/lucid/relations/attachment_relation.d.ts +4 -1
- package/build/src/integrations/lucid/relations/attachment_relation.d.ts.map +1 -1
- package/build/src/integrations/lucid/relations/attachment_relation.js +15 -8
- package/build/src/integrations/lucid/relations/attachment_relation.js.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts +4 -0
- package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_schema_service.js +13 -0
- package/build/src/integrations/lucid/schema/attachment_schema_service.js.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.d.ts.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.js +4 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.js.map +1 -1
- package/build/src/media/binaries.d.ts +79 -0
- package/build/src/media/binaries.d.ts.map +1 -0
- package/build/src/media/binaries.js +288 -0
- package/build/src/media/binaries.js.map +1 -0
- package/build/src/media/blurhash.d.ts +48 -0
- package/build/src/media/blurhash.d.ts.map +1 -0
- package/build/src/media/blurhash.js +46 -0
- package/build/src/media/blurhash.js.map +1 -0
- package/build/src/media/exif.d.ts +23 -0
- package/build/src/media/exif.d.ts.map +1 -0
- package/build/src/media/exif.js +98 -0
- package/build/src/media/exif.js.map +1 -0
- package/build/src/media/media_metadata.d.ts +55 -0
- package/build/src/media/media_metadata.d.ts.map +1 -0
- package/build/src/media/media_metadata.js +27 -0
- package/build/src/media/media_metadata.js.map +1 -0
- package/build/src/media/sharp.d.ts +45 -0
- package/build/src/media/sharp.d.ts.map +1 -0
- package/build/src/media/sharp.js +76 -0
- package/build/src/media/sharp.js.map +1 -0
- package/build/src/media/v5_metadata.d.ts +20 -0
- package/build/src/media/v5_metadata.d.ts.map +1 -0
- package/build/src/media/v5_metadata.js +20 -0
- package/build/src/media/v5_metadata.js.map +1 -0
- package/build/src/queues/memory_queue.d.ts.map +1 -1
- package/build/src/queues/memory_queue.js +4 -1
- package/build/src/queues/memory_queue.js.map +1 -1
- package/build/src/sources/attachment_manager.d.ts +1 -3
- package/build/src/sources/attachment_manager.d.ts.map +1 -1
- package/build/src/sources/attachment_manager.js +19 -12
- package/build/src/sources/attachment_manager.js.map +1 -1
- package/build/src/variants/variant_converter.d.ts +4 -1
- package/build/src/variants/variant_converter.d.ts.map +1 -1
- package/build/src/variants/variant_generation_service.d.ts +9 -3
- package/build/src/variants/variant_generation_service.d.ts.map +1 -1
- package/build/src/variants/variant_generation_service.js +47 -6
- package/build/src/variants/variant_generation_service.js.map +1 -1
- package/build/stubs/config/attachment.stub +23 -2
- package/build/stubs/converters/converter.stub +18 -0
- package/build/tests/adonis_queue.spec.js +56 -1
- package/build/tests/adonis_queue.spec.js.map +1 -1
- package/build/tests/attachment_events.spec.d.ts +8 -0
- package/build/tests/attachment_events.spec.d.ts.map +1 -0
- package/build/tests/attachment_events.spec.js +65 -0
- package/build/tests/attachment_events.spec.js.map +1 -0
- package/build/tests/attachment_job_processor.spec.js +77 -2
- package/build/tests/attachment_job_processor.spec.js.map +1 -1
- package/build/tests/attachment_provider.spec.js +54 -0
- package/build/tests/attachment_provider.spec.js.map +1 -1
- package/build/tests/attachment_schema_service.spec.js +14 -0
- package/build/tests/attachment_schema_service.spec.js.map +1 -1
- package/build/tests/attachment_service.spec.js +81 -2
- package/build/tests/attachment_service.spec.js.map +1 -1
- package/build/tests/autodetect_converter.spec.d.ts +8 -0
- package/build/tests/autodetect_converter.spec.d.ts.map +1 -0
- package/build/tests/autodetect_converter.spec.js +55 -0
- package/build/tests/autodetect_converter.spec.js.map +1 -0
- package/build/tests/binary_media.spec.d.ts +8 -0
- package/build/tests/binary_media.spec.d.ts.map +1 -0
- package/build/tests/binary_media.spec.js +106 -0
- package/build/tests/binary_media.spec.js.map +1 -0
- package/build/tests/blurhash_media.spec.d.ts +8 -0
- package/build/tests/blurhash_media.spec.d.ts.map +1 -0
- package/build/tests/blurhash_media.spec.js +40 -0
- package/build/tests/blurhash_media.spec.js.map +1 -0
- package/build/tests/configure.spec.js +1 -0
- package/build/tests/configure.spec.js.map +1 -1
- package/build/tests/configured_variant_converter_registry.spec.d.ts +8 -0
- package/build/tests/configured_variant_converter_registry.spec.d.ts.map +1 -0
- package/build/tests/configured_variant_converter_registry.spec.js +73 -0
- package/build/tests/configured_variant_converter_registry.spec.js.map +1 -0
- package/build/tests/converter_config.types.d.ts +36 -0
- package/build/tests/converter_config.types.d.ts.map +1 -0
- package/build/tests/converter_config.types.js +60 -0
- package/build/tests/converter_config.types.js.map +1 -0
- package/build/tests/define_config.spec.js +91 -0
- package/build/tests/define_config.spec.js.map +1 -1
- package/build/tests/errors.spec.d.ts +8 -0
- package/build/tests/errors.spec.d.ts.map +1 -0
- package/build/tests/errors.spec.js +43 -0
- package/build/tests/errors.spec.js.map +1 -0
- package/build/tests/exif_media.spec.d.ts +8 -0
- package/build/tests/exif_media.spec.d.ts.map +1 -0
- package/build/tests/exif_media.spec.js +50 -0
- package/build/tests/exif_media.spec.js.map +1 -0
- package/build/tests/helpers/lucid_test_database.d.ts.map +1 -1
- package/build/tests/helpers/lucid_test_database.js +1 -0
- package/build/tests/helpers/lucid_test_database.js.map +1 -1
- package/build/tests/lucid_attachment_column.spec.js +1 -1
- package/build/tests/lucid_attachment_column.spec.js.map +1 -1
- package/build/tests/lucid_attachment_lifecycle_service.spec.js +54 -0
- package/build/tests/lucid_attachment_lifecycle_service.spec.js.map +1 -1
- package/build/tests/lucid_attachment_metadata_persister.spec.d.ts +8 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.d.ts.map +1 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.js +34 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.js.map +1 -0
- package/build/tests/lucid_attachment_relation.spec.js +71 -10
- package/build/tests/lucid_attachment_relation.spec.js.map +1 -1
- package/build/tests/lucid_sqlite_integration.spec.js +2 -1
- package/build/tests/lucid_sqlite_integration.spec.js.map +1 -1
- package/build/tests/lucid_variant_generation_service.spec.js +17 -0
- package/build/tests/lucid_variant_generation_service.spec.js.map +1 -1
- package/build/tests/make_converter.spec.d.ts +8 -0
- package/build/tests/make_converter.spec.d.ts.map +1 -0
- package/build/tests/make_converter.spec.js +32 -0
- package/build/tests/make_converter.spec.js.map +1 -0
- package/build/tests/media_metadata.spec.d.ts +8 -0
- package/build/tests/media_metadata.spec.d.ts.map +1 -0
- package/build/tests/media_metadata.spec.js +51 -0
- package/build/tests/media_metadata.spec.js.map +1 -0
- package/build/tests/migrate_legacy_attachment.spec.js +15 -5
- package/build/tests/migrate_legacy_attachment.spec.js.map +1 -1
- package/build/tests/package_exports.spec.js +18 -2
- package/build/tests/package_exports.spec.js.map +1 -1
- package/build/tests/sharp_media.spec.d.ts +8 -0
- package/build/tests/sharp_media.spec.d.ts.map +1 -0
- package/build/tests/sharp_media.spec.js +84 -0
- package/build/tests/sharp_media.spec.js.map +1 -0
- package/build/tests/v5_metadata.spec.d.ts +8 -0
- package/build/tests/v5_metadata.spec.d.ts.map +1 -0
- package/build/tests/v5_metadata.spec.js +19 -0
- package/build/tests/v5_metadata.spec.js.map +1 -0
- package/build/tests/variant_generation_service.spec.js +122 -0
- package/build/tests/variant_generation_service.spec.js.map +1 -1
- package/package.json +50 -2
|
@@ -22,6 +22,7 @@ test.group('AttachmentSchemaService', (group) => {
|
|
|
22
22
|
await service.createTables();
|
|
23
23
|
assert.isTrue(await database.connection().schema.hasTable('media_attachments'));
|
|
24
24
|
assert.isTrue(await database.connection().schema.hasTable('media_attachment_links'));
|
|
25
|
+
assert.isTrue(await database.connection().schema.hasColumn('media_attachments', 'blurhash'));
|
|
25
26
|
await service.dropTables();
|
|
26
27
|
assert.isFalse(await database.connection().schema.hasTable('media_attachments'));
|
|
27
28
|
assert.isFalse(await database.connection().schema.hasTable('media_attachment_links'));
|
|
@@ -32,7 +33,20 @@ test.group('AttachmentSchemaService', (group) => {
|
|
|
32
33
|
await service.createTables();
|
|
33
34
|
assert.isTrue(await database.connection().schema.hasTable('attachments'));
|
|
34
35
|
assert.isTrue(await database.connection().schema.hasTable('attachment_links'));
|
|
36
|
+
assert.isTrue(await database.connection().schema.hasColumn('attachments', 'blurhash'));
|
|
35
37
|
assert.isFalse(await database.connection().schema.hasTable('attachments_links'));
|
|
36
38
|
});
|
|
39
|
+
test('upgrades an existing blob table with the blurhash column', async ({ assert }) => {
|
|
40
|
+
const tableName = 'legacy_attachments';
|
|
41
|
+
await database.connection().schema.createTable(tableName, (table) => {
|
|
42
|
+
table.uuid('id').primary();
|
|
43
|
+
});
|
|
44
|
+
const service = new AttachmentSchemaService(database.connection().getWriteClient(), { tableName });
|
|
45
|
+
await service.addBlurhashColumn();
|
|
46
|
+
assert.isTrue(await database.connection().schema.hasColumn(tableName, 'blurhash'));
|
|
47
|
+
await service.dropBlurhashColumn();
|
|
48
|
+
await database.connection().schema.dropTable(tableName);
|
|
49
|
+
assert.isFalse(await database.connection().schema.hasColumn(tableName, 'blurhash'));
|
|
50
|
+
});
|
|
37
51
|
});
|
|
38
52
|
//# sourceMappingURL=attachment_schema_service.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment_schema_service.spec.js","sourceRoot":"","sources":["../../tests/attachment_schema_service.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAA;AACvG,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,KAAK,EAAE,EAAE;IAC9C,IAAI,QAA6D,CAAA;IAEjE,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;QACrB,QAAQ,GAAG,MAAM,uBAAuB,EAAE,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,8DAA8D,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACxF,MAAM,OAAO,GAAG,IAAI,uBAAuB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,EAAE;YAClF,SAAS,EAAE,mBAAmB;SAC/B,CAAC,CAAA;QAEF,MAAM,OAAO,CAAC,YAAY,EAAE,CAAA;QAE5B,MAAM,CAAC,MAAM,CAAC,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAA;QAC/E,MAAM,CAAC,MAAM,CAAC,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"attachment_schema_service.spec.js","sourceRoot":"","sources":["../../tests/attachment_schema_service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,6 +102,38 @@ test('keeps drafts in memory until persist resolves their contextual options', a
|
|
|
102
102
|
mimeType: 'application/octet-stream',
|
|
103
103
|
}]);
|
|
104
104
|
});
|
|
105
|
+
test('extracts configured metadata only when meta is enabled', async ({ assert }) => {
|
|
106
|
+
const storage = new FakeStorage();
|
|
107
|
+
const service = new AttachmentService({
|
|
108
|
+
storage,
|
|
109
|
+
queue: new FakeQueue(),
|
|
110
|
+
defaultDisk: 'public',
|
|
111
|
+
createId: () => 'attachment-id',
|
|
112
|
+
metadataExtractors: [
|
|
113
|
+
{
|
|
114
|
+
supports({ attachment }) {
|
|
115
|
+
return attachment.mimeType === 'image/png';
|
|
116
|
+
},
|
|
117
|
+
async extract({ body }) {
|
|
118
|
+
return { width: 800, bytes: body.byteLength };
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
],
|
|
122
|
+
});
|
|
123
|
+
const extracted = await service
|
|
124
|
+
.createDraft({
|
|
125
|
+
body: new Uint8Array([1, 2, 3]),
|
|
126
|
+
originalName: 'avatar.png',
|
|
127
|
+
mimeType: 'image/png',
|
|
128
|
+
metadata: { width: 640, source: 'upload' },
|
|
129
|
+
}, { meta: true })
|
|
130
|
+
.persist();
|
|
131
|
+
const skipped = await service
|
|
132
|
+
.createDraft({ body: new Uint8Array([1]), originalName: 'document.pdf' })
|
|
133
|
+
.persist();
|
|
134
|
+
assert.deepEqual(extracted.metadata, { width: 640, bytes: 3, source: 'upload' });
|
|
135
|
+
assert.isUndefined(skipped.metadata);
|
|
136
|
+
});
|
|
105
137
|
test('persists a draft only once when called concurrently', async ({ assert }) => {
|
|
106
138
|
const storage = new FakeStorage();
|
|
107
139
|
const service = new AttachmentService({
|
|
@@ -125,11 +157,34 @@ test('schedules variant generation without requiring a database or Lucid', async
|
|
|
125
157
|
createId: () => 'attachment-id',
|
|
126
158
|
});
|
|
127
159
|
const attachment = await service.create({ body: new Uint8Array(), originalName: 'report.pdf' });
|
|
128
|
-
await service.scheduleVariantGeneration(attachment, ['thumbnail']);
|
|
160
|
+
await service.scheduleVariantGeneration(attachment, ['thumbnail'], true);
|
|
129
161
|
assert.deepEqual(queue.jobs, [
|
|
130
|
-
{ type: 'generate-variants', attachmentId: 'attachment-id', variantKeys: ['thumbnail'] },
|
|
162
|
+
{ type: 'generate-variants', attachmentId: 'attachment-id', variantKeys: ['thumbnail'], meta: true },
|
|
131
163
|
]);
|
|
132
164
|
});
|
|
165
|
+
test('resolves configured variant keys from manager, decorator, then defaults', async ({ assert }) => {
|
|
166
|
+
const service = new AttachmentService({
|
|
167
|
+
storage: new FakeStorage(),
|
|
168
|
+
queue: new FakeQueue(),
|
|
169
|
+
defaultDisk: 'public',
|
|
170
|
+
defaults: { variants: ['config'] },
|
|
171
|
+
});
|
|
172
|
+
const managerDraft = service.createDraft({ body: new Uint8Array(), originalName: 'avatar.jpg' }, { variants: ['manager'] });
|
|
173
|
+
const plainDraft = service.createDraft({ body: new Uint8Array(), originalName: 'avatar.jpg' });
|
|
174
|
+
assert.deepEqual(service.getVariantKeys(managerDraft, { variants: ['decorator'] }), ['manager']);
|
|
175
|
+
assert.deepEqual(service.getVariantKeys(plainDraft, { variants: ['decorator'] }), ['decorator']);
|
|
176
|
+
assert.deepEqual(service.getVariantKeys(plainDraft), ['config']);
|
|
177
|
+
});
|
|
178
|
+
test('can disable metadata extraction for generated variants independently', ({ assert }) => {
|
|
179
|
+
const service = new AttachmentService({
|
|
180
|
+
storage: new FakeStorage(),
|
|
181
|
+
queue: new FakeQueue(),
|
|
182
|
+
defaultDisk: 'public',
|
|
183
|
+
metadataVariants: false,
|
|
184
|
+
});
|
|
185
|
+
const draft = service.createDraft({ body: new Uint8Array(), originalName: 'avatar.jpg' });
|
|
186
|
+
assert.isUndefined(service.getVariantMetadataEnabled(draft, { meta: true }));
|
|
187
|
+
});
|
|
133
188
|
test('reads an attachment from the configured storage', async ({ assert }) => {
|
|
134
189
|
const storage = new FakeStorage();
|
|
135
190
|
const queue = new FakeQueue();
|
|
@@ -143,4 +198,28 @@ test('reads an attachment from the configured storage', async ({ assert }) => {
|
|
|
143
198
|
assert.deepEqual(await service.read(attachment), new Uint8Array([1, 2, 3]));
|
|
144
199
|
assert.deepEqual(storage.reads, [{ disk: 'public', path: 'attachment-id.pdf' }]);
|
|
145
200
|
});
|
|
201
|
+
test('extracts deferred metadata through a configured persister', async ({ assert }) => {
|
|
202
|
+
const storage = new FakeStorage();
|
|
203
|
+
const queue = new FakeQueue();
|
|
204
|
+
const persisted = [];
|
|
205
|
+
const service = new AttachmentService({
|
|
206
|
+
storage,
|
|
207
|
+
queue,
|
|
208
|
+
defaultDisk: 'public',
|
|
209
|
+
createId: () => 'attachment-id',
|
|
210
|
+
metadataMode: 'deferred',
|
|
211
|
+
metadataExtractors: [{ async extract() { return { dimension: { width: 320, height: 180 } }; } }],
|
|
212
|
+
metadataPersister: {
|
|
213
|
+
async persistMetadata(attachment, metadata) {
|
|
214
|
+
persisted.push({ attachment, metadata });
|
|
215
|
+
},
|
|
216
|
+
},
|
|
217
|
+
});
|
|
218
|
+
const attachment = await service.createDraft({ body: new Uint8Array([1]), originalName: 'avatar.png' }, { meta: true }).persist();
|
|
219
|
+
assert.isUndefined(attachment.metadata);
|
|
220
|
+
await service.scheduleMetadataExtraction(attachment);
|
|
221
|
+
assert.deepEqual(queue.jobs, [{ type: 'extract-metadata', attachmentId: 'attachment-id', attachment }]);
|
|
222
|
+
await service.extractAndPersistMetadata(attachment);
|
|
223
|
+
assert.deepEqual(persisted, [{ attachment, metadata: { dimension: { width: 320, height: 180 } } }]);
|
|
224
|
+
});
|
|
146
225
|
//# sourceMappingURL=attachment_service.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment_service.spec.js","sourceRoot":"","sources":["../../tests/attachment_service.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"attachment_service.spec.js","sourceRoot":"","sources":["../../tests/attachment_service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"autodetect_converter.spec.d.ts","sourceRoot":"","sources":["../../tests/autodetect_converter.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { writeFile } from 'node:fs/promises';
|
|
8
|
+
import { test } from '@japa/runner';
|
|
9
|
+
import AutodetectConverter from '../src/converters/autodetect_converter.js';
|
|
10
|
+
import { ConfiguredVariantConverterRegistry } from '../src/converters/configured_variant_converter_registry.js';
|
|
11
|
+
const pdf = {
|
|
12
|
+
id: 'attachment-id',
|
|
13
|
+
disk: 'fs',
|
|
14
|
+
path: 'uploads/report.pdf',
|
|
15
|
+
name: 'report.pdf',
|
|
16
|
+
originalName: 'report.pdf',
|
|
17
|
+
mimeType: 'application/pdf',
|
|
18
|
+
extname: 'pdf',
|
|
19
|
+
size: 3,
|
|
20
|
+
};
|
|
21
|
+
class FakeRunner {
|
|
22
|
+
executions = [];
|
|
23
|
+
async run(execution) {
|
|
24
|
+
this.executions.push(execution);
|
|
25
|
+
await writeFile(`${execution.args.at(-1)}.png`, new Uint8Array([4, 5]));
|
|
26
|
+
return { stdout: new Uint8Array(), stderr: new Uint8Array() };
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
test.group('AutodetectConverter', () => {
|
|
30
|
+
test('uses Poppler for PDFs and honors v5-style options', async ({ assert }) => {
|
|
31
|
+
const runner = new FakeRunner();
|
|
32
|
+
const converter = new AutodetectConverter({ runner, resize: 320, startPage: 2, folder: 'variants' });
|
|
33
|
+
const output = await converter.handle({ attachment: pdf, body: new Uint8Array([1, 2, 3]), options: converter.options });
|
|
34
|
+
assert.deepEqual(output, {
|
|
35
|
+
body: new Uint8Array([4, 5]),
|
|
36
|
+
fileName: 'autodetect.png',
|
|
37
|
+
mimeType: 'image/png',
|
|
38
|
+
folder: 'variants',
|
|
39
|
+
});
|
|
40
|
+
assert.deepEqual(runner.executions[0]?.args.slice(0, 8), [
|
|
41
|
+
'-f', '2', '-singlefile', '-png', '-scale-to-x', '320', '-scale-to-y', '-1',
|
|
42
|
+
]);
|
|
43
|
+
});
|
|
44
|
+
test('is used when a configured key has no converter loader', async ({ assert }) => {
|
|
45
|
+
const registry = new ConfiguredVariantConverterRegistry({ thumbnail: { blurhash: true } });
|
|
46
|
+
const converter = await registry.get('thumbnail');
|
|
47
|
+
assert.equal(converter?.key, 'thumbnail');
|
|
48
|
+
assert.isTrue(converter?.blurhash === true);
|
|
49
|
+
assert.isUndefined(await converter?.convert({
|
|
50
|
+
attachment: { ...pdf, mimeType: 'application/zip', name: 'archive.zip' },
|
|
51
|
+
body: new Uint8Array(),
|
|
52
|
+
}));
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=autodetect_converter.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"autodetect_converter.spec.js","sourceRoot":"","sources":["../../tests/autodetect_converter.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binary_media.spec.d.ts","sourceRoot":"","sources":["../../tests/binary_media.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { readFile, writeFile } from 'node:fs/promises';
|
|
8
|
+
import { test } from '@japa/runner';
|
|
9
|
+
import { createDocumentThumbnailConverter, createFfmpegThumbnailConverter, createFfprobeMetadataExtractor, createPdfInfoMetadataExtractor, createPdfThumbnailConverter, CommandTimeoutError, NodeCommandRunner, } from '../src/media/binaries.js';
|
|
10
|
+
const video = {
|
|
11
|
+
id: 'attachment-id',
|
|
12
|
+
disk: 'fs',
|
|
13
|
+
path: 'uploads/video.mp4',
|
|
14
|
+
name: 'video.mp4',
|
|
15
|
+
originalName: 'video.mp4',
|
|
16
|
+
mimeType: 'video/mp4',
|
|
17
|
+
extname: 'mp4',
|
|
18
|
+
size: 3,
|
|
19
|
+
};
|
|
20
|
+
class FakeRunner {
|
|
21
|
+
executions = [];
|
|
22
|
+
stdout = new Uint8Array();
|
|
23
|
+
async run(execution) {
|
|
24
|
+
this.executions.push(execution);
|
|
25
|
+
if (execution.command === 'ffmpeg') {
|
|
26
|
+
await writeFile(execution.args.at(-1), new Uint8Array([4, 5]));
|
|
27
|
+
}
|
|
28
|
+
if (execution.command === 'pdftoppm') {
|
|
29
|
+
await writeFile(`${execution.args.at(-1)}.png`, new Uint8Array([6, 7]));
|
|
30
|
+
}
|
|
31
|
+
if (execution.command === 'libreoffice') {
|
|
32
|
+
const source = execution.args.at(-1);
|
|
33
|
+
await writeFile(source.replace(/\.[^.]+$/, '.pdf'), await readFile(source));
|
|
34
|
+
}
|
|
35
|
+
return { stdout: this.stdout, stderr: new Uint8Array() };
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
test.group('Binary media adapters', () => {
|
|
39
|
+
test('extracts normalized ffprobe metadata', async ({ assert }) => {
|
|
40
|
+
const runner = new FakeRunner();
|
|
41
|
+
runner.stdout = Buffer.from(JSON.stringify({
|
|
42
|
+
format: { duration: '12.5', bit_rate: '450000', format_name: 'mov,mp4,m4a,3gp,3g2,mj2' },
|
|
43
|
+
streams: [
|
|
44
|
+
{ codec_type: 'video', codec_name: 'h264', width: 1920, height: 1080 },
|
|
45
|
+
{ codec_type: 'audio', codec_name: 'aac' },
|
|
46
|
+
],
|
|
47
|
+
}));
|
|
48
|
+
const extractor = createFfprobeMetadataExtractor({ runner });
|
|
49
|
+
const metadata = await extractor.extract({ attachment: video, body: new Uint8Array([1, 2, 3]) });
|
|
50
|
+
assert.deepEqual(metadata, {
|
|
51
|
+
duration: 12.5,
|
|
52
|
+
bitRate: 450000,
|
|
53
|
+
format: 'mov,mp4,m4a,3gp,3g2,mj2',
|
|
54
|
+
dimension: { width: 1920, height: 1080 },
|
|
55
|
+
videoCodec: 'h264',
|
|
56
|
+
audioCodec: 'aac',
|
|
57
|
+
});
|
|
58
|
+
assert.equal(runner.executions[0]?.command, 'ffprobe');
|
|
59
|
+
assert.isTrue(await extractor.supports({ attachment: video }));
|
|
60
|
+
assert.isFalse(await extractor.supports({ attachment: { ...video, mimeType: 'application/pdf' } }));
|
|
61
|
+
});
|
|
62
|
+
test('creates ffmpeg, PDF and office-document thumbnails', async ({ assert }) => {
|
|
63
|
+
const runner = new FakeRunner();
|
|
64
|
+
const ffmpeg = createFfmpegThumbnailConverter({
|
|
65
|
+
key: 'video-thumb', runner, time: 3, width: 320, format: 'webp', folder: 'variants',
|
|
66
|
+
});
|
|
67
|
+
const pdf = createPdfThumbnailConverter({ key: 'pdf-thumb', runner, width: 400 });
|
|
68
|
+
const document = createDocumentThumbnailConverter({ key: 'doc-thumb', runner, width: 400 });
|
|
69
|
+
assert.deepEqual(await ffmpeg.convert({ attachment: video, body: new Uint8Array([1]) }), {
|
|
70
|
+
body: new Uint8Array([4, 5]), fileName: 'video-thumb.webp', mimeType: 'image/webp', folder: 'variants',
|
|
71
|
+
});
|
|
72
|
+
assert.deepEqual(await pdf.convert({ attachment: { ...video, name: 'report.pdf' }, body: new Uint8Array([2]) }), {
|
|
73
|
+
body: new Uint8Array([6, 7]), fileName: 'pdf-thumb.png', mimeType: 'image/png',
|
|
74
|
+
});
|
|
75
|
+
assert.deepEqual(await document.convert({ attachment: { ...video, name: 'report.docx' }, body: new Uint8Array([3]) }), {
|
|
76
|
+
body: new Uint8Array([6, 7]), fileName: 'doc-thumb.png', mimeType: 'image/png',
|
|
77
|
+
});
|
|
78
|
+
assert.deepEqual(runner.executions.map((execution) => execution.command), [
|
|
79
|
+
'ffmpeg', 'pdftoppm', 'libreoffice', 'pdftoppm',
|
|
80
|
+
]);
|
|
81
|
+
assert.include(runner.executions[0]?.args ?? [], '-ss');
|
|
82
|
+
assert.include(runner.executions[0]?.args ?? [], 'scale=320:-1');
|
|
83
|
+
});
|
|
84
|
+
test('extracts v5-compatible PDF metadata through pdfinfo', async ({ assert }) => {
|
|
85
|
+
const runner = new FakeRunner();
|
|
86
|
+
runner.stdout = Buffer.from([
|
|
87
|
+
'Pages: 4',
|
|
88
|
+
'Page size: 612 x 792 pts (letter)',
|
|
89
|
+
'PDF version: 1.7',
|
|
90
|
+
'CreationDate: Wed Jan 15 18:51:34 2020 UTC',
|
|
91
|
+
].join('\n'));
|
|
92
|
+
const extractor = createPdfInfoMetadataExtractor({ runner });
|
|
93
|
+
assert.deepEqual(await extractor.extract({ attachment: { ...video, mimeType: 'application/pdf', name: 'report.pdf' }, body: new Uint8Array([1]) }), {
|
|
94
|
+
dimension: { width: 612, height: 792 },
|
|
95
|
+
pages: 4,
|
|
96
|
+
version: '1.7',
|
|
97
|
+
date: '2020-01-15T18:51:34.000Z',
|
|
98
|
+
});
|
|
99
|
+
assert.equal(runner.executions[0]?.command, 'pdfinfo');
|
|
100
|
+
});
|
|
101
|
+
test('aborts timed-out commands in the Node runner', async ({ assert }) => {
|
|
102
|
+
const runner = new NodeCommandRunner();
|
|
103
|
+
await assert.rejects(() => runner.run({ command: process.execPath, args: ['-e', 'setTimeout(() => {}, 1000)'], timeout: 10 }), CommandTimeoutError);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=binary_media.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binary_media.spec.js","sourceRoot":"","sources":["../../tests/binary_media.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blurhash_media.spec.d.ts","sourceRoot":"","sources":["../../tests/blurhash_media.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { test } from '@japa/runner';
|
|
8
|
+
import { createSharpBlurhashGenerator, isBlurhashEnabled, resolveBlurhashComponents, } from '../src/media/blurhash.js';
|
|
9
|
+
test.group('Blurhash media adapter', () => {
|
|
10
|
+
test('encodes raw alpha pixels with v5 default components', async ({ assert }) => {
|
|
11
|
+
const calls = [];
|
|
12
|
+
const generator = createSharpBlurhashGenerator(() => ({
|
|
13
|
+
raw() {
|
|
14
|
+
return this;
|
|
15
|
+
},
|
|
16
|
+
ensureAlpha() {
|
|
17
|
+
return this;
|
|
18
|
+
},
|
|
19
|
+
async toBuffer() {
|
|
20
|
+
return { data: new Uint8Array([1, 2, 3, 255]), info: { width: 1, height: 1 } };
|
|
21
|
+
},
|
|
22
|
+
}), (...input) => {
|
|
23
|
+
calls.push(input);
|
|
24
|
+
return 'LEHV6nWB2yk8pyo0adR*.7kCMdnj';
|
|
25
|
+
});
|
|
26
|
+
const hash = await generator.generate({
|
|
27
|
+
body: new Uint8Array([1, 2, 3]),
|
|
28
|
+
...resolveBlurhashComponents(true),
|
|
29
|
+
});
|
|
30
|
+
assert.equal(hash, 'LEHV6nWB2yk8pyo0adR*.7kCMdnj');
|
|
31
|
+
assert.deepEqual(calls, [[new Uint8ClampedArray([1, 2, 3, 255]), 1, 1, 4, 4]]);
|
|
32
|
+
assert.isTrue(isBlurhashEnabled(true));
|
|
33
|
+
assert.isFalse(isBlurhashEnabled(false));
|
|
34
|
+
assert.deepEqual(resolveBlurhashComponents({ enabled: true, componentX: 3, componentY: 5 }), {
|
|
35
|
+
componentX: 3,
|
|
36
|
+
componentY: 5,
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=blurhash_media.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blurhash_media.spec.js","sourceRoot":"","sources":["../../tests/blurhash_media.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAA;AAEjC,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACxC,IAAI,CAAC,qDAAqD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAC/E,MAAM,KAAK,GAAgB,EAAE,CAAA;QAC7B,MAAM,SAAS,GAAG,4BAA4B,CAC5C,GAAG,EAAE,CAAC,CAAC;YACL,GAAG;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,WAAW;gBACT,OAAO,IAAI,CAAA;YACb,CAAC;YACD,KAAK,CAAC,QAAQ;gBACZ,OAAO,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAA;YAChF,CAAC;SACF,CAAC,EACF,CAAC,GAAG,KAAK,EAAE,EAAE;YACX,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjB,OAAO,8BAA8B,CAAA;QACvC,CAAC,CACF,CAAA;QAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC;YACpC,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,GAAG,yBAAyB,CAAC,IAAI,CAAC;SACnC,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,8BAA8B,CAAC,CAAA;QAClD,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9E,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;QACtC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAA;QACxC,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE;YAC3F,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,CAAC;SACd,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -32,6 +32,7 @@ test.group('configure', () => {
|
|
|
32
32
|
assert.deepEqual(commands, ['@jrmc/adonis-attachment/commands']);
|
|
33
33
|
await access(join(stubsRoot, 'config/attachment.stub'));
|
|
34
34
|
assert.include(await readFile(join(stubsRoot, 'config/attachment.stub'), 'utf8'), 'storage: LocalFileStorage.fromApp');
|
|
35
|
+
assert.include(await readFile(join(stubsRoot, 'config/attachment.stub'), 'utf8'), 'createV5CompatibleMetadataExtractors()');
|
|
35
36
|
assert.notInclude(await readFile(join(stubsRoot, 'config/attachment.stub'), 'utf8'), 'maxBytes');
|
|
36
37
|
});
|
|
37
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.spec.js","sourceRoot":"","sources":["../../tests/configure.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE;IAC3B,IAAI,CAAC,4EAA4E,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACtG,MAAM,KAAK,GAA0E,EAAE,CAAA;QACvF,MAAM,SAAS,GAAa,EAAE,CAAA;QAC9B,MAAM,QAAQ,GAAa,EAAE,CAAA;QAE7B,MAAM,SAAS,CAAC;YACd,KAAK,CAAC,cAAc;gBAClB,OAAO;oBACL,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,KAA8B;wBAC5E,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;oBACnC,CAAC;oBACD,KAAK,CAAC,YAAY,CAAC,QAAiG;wBAClH,QAAQ,CAAC;4BACP,WAAW,CAAC,KAAK;gCACf,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;4BACvB,CAAC;4BACD,UAAU,CAAC,KAAK;gCACd,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;4BACtB,CAAC;yBACF,CAAC,CAAA;oBACJ,CAAC;iBACF,CAAA;YACH,CAAC;SACO,CAAC,CAAA;QAEX,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACzF,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,6CAA6C,CAAC,CAAC,CAAA;QAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,kCAAkC,CAAC,CAAC,CAAA;QAChE,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,CACZ,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EAAE,MAAM,CAAC,EACjE,mCAAmC,CACpC,CAAA;QACD,MAAM,CAAC,UAAU,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAAA;IAClG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"configure.spec.js","sourceRoot":"","sources":["../../tests/configure.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE;IAC3B,IAAI,CAAC,4EAA4E,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACtG,MAAM,KAAK,GAA0E,EAAE,CAAA;QACvF,MAAM,SAAS,GAAa,EAAE,CAAA;QAC9B,MAAM,QAAQ,GAAa,EAAE,CAAA;QAE7B,MAAM,SAAS,CAAC;YACd,KAAK,CAAC,cAAc;gBAClB,OAAO;oBACL,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,KAA8B;wBAC5E,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;oBACnC,CAAC;oBACD,KAAK,CAAC,YAAY,CAAC,QAAiG;wBAClH,QAAQ,CAAC;4BACP,WAAW,CAAC,KAAK;gCACf,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;4BACvB,CAAC;4BACD,UAAU,CAAC,KAAK;gCACd,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;4BACtB,CAAC;yBACF,CAAC,CAAA;oBACJ,CAAC;iBACF,CAAA;YACH,CAAC;SACO,CAAC,CAAA;QAEX,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACzF,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,6CAA6C,CAAC,CAAC,CAAA;QAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,kCAAkC,CAAC,CAAC,CAAA;QAChE,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,CACZ,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EAAE,MAAM,CAAC,EACjE,mCAAmC,CACpC,CAAA;QACD,MAAM,CAAC,OAAO,CACZ,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EAAE,MAAM,CAAC,EACjE,wCAAwC,CACzC,CAAA;QACD,MAAM,CAAC,UAAU,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAAA;IAClG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configured_variant_converter_registry.spec.d.ts","sourceRoot":"","sources":["../../tests/configured_variant_converter_registry.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { test } from '@japa/runner';
|
|
8
|
+
import Converter from '../src/converters/converter.js';
|
|
9
|
+
import { ConfiguredVariantConverterRegistry } from '../src/converters/configured_variant_converter_registry.js';
|
|
10
|
+
const attachment = {
|
|
11
|
+
id: 'attachment-id',
|
|
12
|
+
disk: 'fs',
|
|
13
|
+
path: 'uploads/avatar.jpg',
|
|
14
|
+
name: 'avatar.jpg',
|
|
15
|
+
originalName: 'avatar.jpg',
|
|
16
|
+
mimeType: 'image/jpeg',
|
|
17
|
+
extname: 'jpg',
|
|
18
|
+
size: 3,
|
|
19
|
+
};
|
|
20
|
+
class ThumbnailConverter extends Converter {
|
|
21
|
+
async handle({ body, options }) {
|
|
22
|
+
return {
|
|
23
|
+
body,
|
|
24
|
+
fileName: `thumbnail-${String(options.width)}.webp`,
|
|
25
|
+
mimeType: 'image/webp',
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
test.group('ConfiguredVariantConverterRegistry', () => {
|
|
30
|
+
test('loads a v5-style converter once and passes its direct options', async ({ assert }) => {
|
|
31
|
+
let imports = 0;
|
|
32
|
+
const registry = new ConfiguredVariantConverterRegistry({
|
|
33
|
+
thumbnail: {
|
|
34
|
+
width: 320,
|
|
35
|
+
blurhash: true,
|
|
36
|
+
converter: async () => {
|
|
37
|
+
imports += 1;
|
|
38
|
+
return { default: ThumbnailConverter };
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
const [first, second] = await Promise.all([registry.get('thumbnail'), registry.get('thumbnail')]);
|
|
43
|
+
const output = await first?.convert({ attachment, body: new Uint8Array([1, 2, 3]) });
|
|
44
|
+
assert.equal(first, second);
|
|
45
|
+
assert.equal(imports, 1);
|
|
46
|
+
assert.deepEqual(await registry.keys(), ['thumbnail']);
|
|
47
|
+
assert.isTrue(first?.blurhash === true);
|
|
48
|
+
assert.deepEqual(output, {
|
|
49
|
+
body: new Uint8Array([1, 2, 3]),
|
|
50
|
+
fileName: 'thumbnail-320.webp',
|
|
51
|
+
mimeType: 'image/webp',
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
test('accepts a direct VariantConverter export and uses the configured key', async ({ assert }) => {
|
|
55
|
+
const registry = new ConfiguredVariantConverterRegistry({
|
|
56
|
+
preview: {
|
|
57
|
+
converter: async () => ({
|
|
58
|
+
default: {
|
|
59
|
+
key: 'ignored',
|
|
60
|
+
async convert() {
|
|
61
|
+
return undefined;
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
}),
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
const converter = await registry.get('preview');
|
|
68
|
+
assert.equal(converter?.key, 'preview');
|
|
69
|
+
assert.isUndefined(await converter?.convert({ attachment, body: new Uint8Array() }));
|
|
70
|
+
assert.isUndefined(await registry.get('missing'));
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=configured_variant_converter_registry.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configured_variant_converter_registry.spec.js","sourceRoot":"","sources":["../../tests/configured_variant_converter_registry.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,SAAS,MAAM,gCAAgC,CAAA;AACtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,4DAA4D,CAAA;AAG/G,MAAM,UAAU,GAAe;IAC7B,EAAE,EAAE,eAAe;IACnB,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,YAAY;IAC1B,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,CAAC;CACR,CAAA;AAED,MAAM,kBAAmB,SAAQ,SAAS;IACxC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAsC;QAChE,OAAO;YACL,IAAI;YACJ,QAAQ,EAAE,aAAa,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO;YACnD,QAAQ,EAAE,YAAY;SACvB,CAAA;IACH,CAAC;CACF;AAED,IAAI,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,EAAE;IACpD,IAAI,CAAC,+DAA+D,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACzF,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,MAAM,QAAQ,GAAG,IAAI,kCAAkC,CAAC;YACtD,SAAS,EAAE;gBACT,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,KAAK,IAAI,EAAE;oBACpB,OAAO,IAAI,CAAC,CAAA;oBACZ,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAA;gBACxC,CAAC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QACjG,MAAM,MAAM,GAAG,MAAM,KAAK,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAEpF,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC3B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;QACxB,MAAM,CAAC,SAAS,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;QACtD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAA;QACvC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE;YACvB,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,sEAAsE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChG,MAAM,QAAQ,GAAG,IAAI,kCAAkC,CAAC;YACtD,OAAO,EAAE;gBACP,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACtB,OAAO,EAAE;wBACP,GAAG,EAAE,SAAS;wBACd,KAAK,CAAC,OAAO;4BACX,OAAO,SAAS,CAAA;wBAClB,CAAC;qBACF;iBACF,CAAC;aACH;SACF,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAE/C,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;QACvC,MAAM,CAAC,WAAW,CAAC,MAAM,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC,CAAC,CAAA;QACpF,MAAM,CAAC,WAAW,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { type InferConverters } from '../index.js';
|
|
8
|
+
declare const attachmentConfig: import("@adonisjs/core/types").ConfigProvider<import("../index.js").ResolvedAttachmentConfig<{
|
|
9
|
+
readonly thumbnail: {
|
|
10
|
+
readonly resize: {
|
|
11
|
+
readonly width: 320;
|
|
12
|
+
readonly fit: "cover";
|
|
13
|
+
readonly background: "#ffffff";
|
|
14
|
+
};
|
|
15
|
+
readonly format: {
|
|
16
|
+
readonly format: "webp";
|
|
17
|
+
readonly options: {
|
|
18
|
+
readonly quality: 82;
|
|
19
|
+
readonly effort: 4;
|
|
20
|
+
};
|
|
21
|
+
};
|
|
22
|
+
};
|
|
23
|
+
readonly preview: {
|
|
24
|
+
readonly resize: 640;
|
|
25
|
+
readonly format: "tiff";
|
|
26
|
+
};
|
|
27
|
+
readonly config: {};
|
|
28
|
+
readonly decorator: {};
|
|
29
|
+
readonly manager: {};
|
|
30
|
+
}>>;
|
|
31
|
+
declare module '../index.js' {
|
|
32
|
+
interface AttachmentVariants extends InferConverters<typeof attachmentConfig> {
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
export {};
|
|
36
|
+
//# sourceMappingURL=converter_config.types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"converter_config.types.d.ts","sourceRoot":"","sources":["../../tests/converter_config.types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAOL,KAAK,eAAe,EACrB,MAAM,aAAa,CAAA;AASpB,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;GAkBpB,CAAA;AASF,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,kBAAmB,SAAQ,eAAe,CAAC,OAAO,gBAAgB,CAAC;KAAG;CACjF;AA8CD,OAAO,EAAE,CAAA"}
|