@jrmc/adonis-attachment 6.0.0-alpha.1 → 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.
Files changed (336) hide show
  1. package/build/commands/commands.json +1 -1
  2. package/build/commands/make/attachment_v5_migration.d.ts.map +1 -1
  3. package/build/commands/make/attachment_v5_migration.js +6 -3
  4. package/build/commands/make/attachment_v5_migration.js.map +1 -1
  5. package/build/commands/make/attachments_table.d.ts.map +1 -1
  6. package/build/commands/make/attachments_table.js +8 -2
  7. package/build/commands/make/attachments_table.js.map +1 -1
  8. package/build/commands/make/converter.d.ts +17 -0
  9. package/build/commands/make/converter.d.ts.map +1 -0
  10. package/build/commands/make/converter.js +27 -0
  11. package/build/commands/make/converter.js.map +1 -0
  12. package/build/index.d.ts +12 -6
  13. package/build/index.d.ts.map +1 -1
  14. package/build/index.js +3 -5
  15. package/build/index.js.map +1 -1
  16. package/build/providers/attachment_provider.d.ts.map +1 -1
  17. package/build/providers/attachment_provider.js +36 -1
  18. package/build/providers/attachment_provider.js.map +1 -1
  19. package/build/services/converters.d.ts +10 -0
  20. package/build/services/converters.d.ts.map +1 -0
  21. package/build/services/converters.js +17 -0
  22. package/build/services/converters.js.map +1 -0
  23. package/build/src/adapters/adonis_drive_storage.d.ts.map +1 -1
  24. package/build/src/adapters/adonis_drive_storage.js +4 -1
  25. package/build/src/adapters/adonis_drive_storage.js.map +1 -1
  26. package/build/src/adapters/local_file_storage.d.ts.map +1 -1
  27. package/build/src/adapters/local_file_storage.js +9 -2
  28. package/build/src/adapters/local_file_storage.js.map +1 -1
  29. package/build/src/converters/autodetect_converter.d.ts +24 -0
  30. package/build/src/converters/autodetect_converter.d.ts.map +1 -0
  31. package/build/src/converters/autodetect_converter.js +113 -0
  32. package/build/src/converters/autodetect_converter.js.map +1 -0
  33. package/build/src/converters/configured_variant_converter_registry.d.ts +36 -0
  34. package/build/src/converters/configured_variant_converter_registry.d.ts.map +1 -0
  35. package/build/src/converters/configured_variant_converter_registry.js +81 -0
  36. package/build/src/converters/configured_variant_converter_registry.js.map +1 -0
  37. package/build/src/converters/converter.d.ts +148 -0
  38. package/build/src/converters/converter.d.ts.map +1 -0
  39. package/build/src/converters/converter.js +24 -0
  40. package/build/src/converters/converter.js.map +1 -0
  41. package/build/src/core/attachment.d.ts +7 -3
  42. package/build/src/core/attachment.d.ts.map +1 -1
  43. package/build/src/core/attachment.js +29 -4
  44. package/build/src/core/attachment.js.map +1 -1
  45. package/build/src/core/attachment_job_processor.d.ts +17 -1
  46. package/build/src/core/attachment_job_processor.d.ts.map +1 -1
  47. package/build/src/core/attachment_job_processor.js +81 -8
  48. package/build/src/core/attachment_job_processor.js.map +1 -1
  49. package/build/src/core/attachment_metadata_persister.d.ts +13 -0
  50. package/build/src/core/attachment_metadata_persister.d.ts.map +1 -0
  51. package/build/{tests/create_legacy_attachment_migration_script.spec.d.ts → src/core/attachment_metadata_persister.js} +1 -1
  52. package/build/src/core/attachment_metadata_persister.js.map +1 -0
  53. package/build/src/core/attachment_options.d.ts +3 -2
  54. package/build/src/core/attachment_options.d.ts.map +1 -1
  55. package/build/src/core/attachment_options.js.map +1 -1
  56. package/build/src/core/attachment_service.d.ts +24 -1
  57. package/build/src/core/attachment_service.d.ts.map +1 -1
  58. package/build/src/core/attachment_service.js +95 -4
  59. package/build/src/core/attachment_service.js.map +1 -1
  60. package/build/src/core/index.d.ts +9 -2
  61. package/build/src/core/index.d.ts.map +1 -1
  62. package/build/src/core/index.js +8 -2
  63. package/build/src/core/index.js.map +1 -1
  64. package/build/src/core/queue.d.ts +11 -1
  65. package/build/src/core/queue.d.ts.map +1 -1
  66. package/build/src/define_config.d.ts +40 -3
  67. package/build/src/define_config.d.ts.map +1 -1
  68. package/build/src/define_config.js +43 -1
  69. package/build/src/define_config.js.map +1 -1
  70. package/build/src/errors.d.ts +57 -0
  71. package/build/src/errors.d.ts.map +1 -0
  72. package/build/src/errors.js +96 -0
  73. package/build/src/errors.js.map +1 -0
  74. package/build/src/events/adonis_attachment_event_emitter.d.ts +17 -0
  75. package/build/src/events/adonis_attachment_event_emitter.d.ts.map +1 -0
  76. package/build/src/events/adonis_attachment_event_emitter.js +17 -0
  77. package/build/src/events/adonis_attachment_event_emitter.js.map +1 -0
  78. package/build/src/events/attachment_events.d.ts +43 -0
  79. package/build/src/events/attachment_events.d.ts.map +1 -0
  80. package/build/src/events/attachment_events.js +32 -0
  81. package/build/src/events/attachment_events.js.map +1 -0
  82. package/build/src/integrations/lucid/{attachment_column.d.ts → column/attachment_column.d.ts} +2 -2
  83. package/build/src/integrations/lucid/column/attachment_column.d.ts.map +1 -0
  84. package/build/src/integrations/lucid/{attachment_column.js → column/attachment_column.js} +2 -2
  85. package/build/src/integrations/lucid/column/attachment_column.js.map +1 -0
  86. package/build/src/integrations/lucid/index.d.ts +17 -13
  87. package/build/src/integrations/lucid/index.d.ts.map +1 -1
  88. package/build/src/integrations/lucid/index.js +17 -13
  89. package/build/src/integrations/lucid/index.js.map +1 -1
  90. package/build/src/integrations/lucid/migrations/legacy/legacy_attachment_migration_stub.d.ts +20 -0
  91. package/build/src/integrations/lucid/migrations/legacy/legacy_attachment_migration_stub.d.ts.map +1 -0
  92. package/build/src/integrations/lucid/migrations/legacy/legacy_attachment_migration_stub.js +18 -0
  93. package/build/src/integrations/lucid/migrations/legacy/legacy_attachment_migration_stub.js.map +1 -0
  94. package/build/src/integrations/lucid/{migrate_legacy_attachment.d.ts → migrations/legacy/migrate_legacy_attachment.d.ts} +22 -10
  95. package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.d.ts.map +1 -0
  96. package/build/src/integrations/lucid/{migrate_legacy_attachment.js → migrations/legacy/migrate_legacy_attachment.js} +35 -25
  97. package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.js.map +1 -0
  98. package/build/src/integrations/lucid/{migrate_legacy_attachment_records.d.ts → migrations/legacy/migrate_legacy_attachment_records.d.ts} +3 -3
  99. package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.d.ts.map +1 -0
  100. package/build/src/integrations/lucid/{migrate_legacy_attachment_records.js → migrations/legacy/migrate_legacy_attachment_records.js} +11 -7
  101. package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.js.map +1 -0
  102. package/build/src/integrations/lucid/models/attachment_link_model.d.ts +30 -0
  103. package/build/src/integrations/lucid/models/attachment_link_model.d.ts.map +1 -0
  104. package/build/src/integrations/lucid/models/attachment_link_model.js +59 -0
  105. package/build/src/integrations/lucid/models/attachment_link_model.js.map +1 -0
  106. package/build/src/integrations/lucid/{attachment_model.d.ts → models/attachment_model.d.ts} +5 -8
  107. package/build/src/integrations/lucid/models/attachment_model.d.ts.map +1 -0
  108. package/build/src/integrations/lucid/{attachment_model.js → models/attachment_model.js} +5 -16
  109. package/build/src/integrations/lucid/models/attachment_model.js.map +1 -0
  110. package/build/src/integrations/lucid/{lucid_attachment_lifecycle_service.d.ts → persistence/lucid_attachment_lifecycle_service.d.ts} +18 -14
  111. package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.d.ts.map +1 -0
  112. package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js +252 -0
  113. package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js.map +1 -0
  114. package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts +17 -0
  115. package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts.map +1 -0
  116. package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js +18 -0
  117. package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js.map +1 -0
  118. package/build/src/integrations/lucid/{lucid_attachment_repository.d.ts → persistence/lucid_attachment_repository.d.ts} +3 -3
  119. package/build/src/integrations/lucid/persistence/lucid_attachment_repository.d.ts.map +1 -0
  120. package/build/src/integrations/lucid/{lucid_attachment_repository.js → persistence/lucid_attachment_repository.js} +1 -1
  121. package/build/src/integrations/lucid/persistence/lucid_attachment_repository.js.map +1 -0
  122. package/build/src/integrations/lucid/persistence/lucid_attachment_store.d.ts +48 -0
  123. package/build/src/integrations/lucid/persistence/lucid_attachment_store.d.ts.map +1 -0
  124. package/build/src/integrations/lucid/persistence/lucid_attachment_store.js +226 -0
  125. package/build/src/integrations/lucid/persistence/lucid_attachment_store.js.map +1 -0
  126. package/build/src/integrations/lucid/{lucid_variant_generation_service.d.ts → persistence/lucid_variant_generation_service.d.ts} +8 -5
  127. package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.d.ts.map +1 -0
  128. package/build/src/integrations/lucid/{lucid_variant_generation_service.js → persistence/lucid_variant_generation_service.js} +9 -3
  129. package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.js.map +1 -0
  130. package/build/src/integrations/lucid/relations/attachment_owner.d.ts.map +1 -0
  131. package/build/src/integrations/lucid/relations/attachment_owner.js.map +1 -0
  132. package/build/src/integrations/lucid/{attachment_relation.d.ts → relations/attachment_relation.d.ts} +29 -15
  133. package/build/src/integrations/lucid/relations/attachment_relation.d.ts.map +1 -0
  134. package/build/src/integrations/lucid/relations/attachment_relation.js +273 -0
  135. package/build/src/integrations/lucid/relations/attachment_relation.js.map +1 -0
  136. package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts +28 -0
  137. package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts.map +1 -0
  138. package/build/src/integrations/lucid/schema/attachment_schema_service.js +81 -0
  139. package/build/src/integrations/lucid/schema/attachment_schema_service.js.map +1 -0
  140. package/build/src/integrations/lucid/schema/attachment_table_names.d.ts +15 -0
  141. package/build/src/integrations/lucid/schema/attachment_table_names.d.ts.map +1 -0
  142. package/build/src/integrations/lucid/schema/attachment_table_names.js +23 -0
  143. package/build/src/integrations/lucid/schema/attachment_table_names.js.map +1 -0
  144. package/build/src/integrations/lucid/schema/attachments_table_stub.d.ts.map +1 -0
  145. package/build/src/integrations/lucid/{attachments_table_stub.js → schema/attachments_table_stub.js} +2 -4
  146. package/build/src/integrations/lucid/schema/attachments_table_stub.js.map +1 -0
  147. package/build/src/integrations/lucid/schema/configure_lucid_attachment_tables.d.ts +12 -0
  148. package/build/src/integrations/lucid/schema/configure_lucid_attachment_tables.d.ts.map +1 -0
  149. package/build/src/integrations/lucid/schema/configure_lucid_attachment_tables.js +19 -0
  150. package/build/src/integrations/lucid/schema/configure_lucid_attachment_tables.js.map +1 -0
  151. package/build/src/media/binaries.d.ts +79 -0
  152. package/build/src/media/binaries.d.ts.map +1 -0
  153. package/build/src/media/binaries.js +288 -0
  154. package/build/src/media/binaries.js.map +1 -0
  155. package/build/src/media/blurhash.d.ts +48 -0
  156. package/build/src/media/blurhash.d.ts.map +1 -0
  157. package/build/src/media/blurhash.js +46 -0
  158. package/build/src/media/blurhash.js.map +1 -0
  159. package/build/src/media/exif.d.ts +23 -0
  160. package/build/src/media/exif.d.ts.map +1 -0
  161. package/build/src/media/exif.js +98 -0
  162. package/build/src/media/exif.js.map +1 -0
  163. package/build/src/media/media_metadata.d.ts +55 -0
  164. package/build/src/media/media_metadata.d.ts.map +1 -0
  165. package/build/src/media/media_metadata.js +27 -0
  166. package/build/src/media/media_metadata.js.map +1 -0
  167. package/build/src/media/sharp.d.ts +45 -0
  168. package/build/src/media/sharp.d.ts.map +1 -0
  169. package/build/src/media/sharp.js +76 -0
  170. package/build/src/media/sharp.js.map +1 -0
  171. package/build/src/media/v5_metadata.d.ts +20 -0
  172. package/build/src/media/v5_metadata.d.ts.map +1 -0
  173. package/build/src/media/v5_metadata.js +20 -0
  174. package/build/src/media/v5_metadata.js.map +1 -0
  175. package/build/src/queues/memory_queue.d.ts.map +1 -1
  176. package/build/src/queues/memory_queue.js +4 -1
  177. package/build/src/queues/memory_queue.js.map +1 -1
  178. package/build/src/sources/attachment_manager.d.ts +1 -3
  179. package/build/src/sources/attachment_manager.d.ts.map +1 -1
  180. package/build/src/sources/attachment_manager.js +19 -12
  181. package/build/src/sources/attachment_manager.js.map +1 -1
  182. package/build/src/variants/variant_converter.d.ts +4 -1
  183. package/build/src/variants/variant_converter.d.ts.map +1 -1
  184. package/build/src/variants/variant_generation_service.d.ts +9 -3
  185. package/build/src/variants/variant_generation_service.d.ts.map +1 -1
  186. package/build/src/variants/variant_generation_service.js +47 -6
  187. package/build/src/variants/variant_generation_service.js.map +1 -1
  188. package/build/stubs/config/attachment.stub +23 -2
  189. package/build/stubs/converters/converter.stub +18 -0
  190. package/build/stubs/migrations/attachments_table.stub +7 -25
  191. package/build/{src/integrations/lucid/render_legacy_attachment_migration_script.js → stubs/migrations/legacy_attachment_migration.stub} +13 -15
  192. package/build/tests/adonis_queue.spec.js +56 -1
  193. package/build/tests/adonis_queue.spec.js.map +1 -1
  194. package/build/tests/attachment_events.spec.d.ts +8 -0
  195. package/build/tests/attachment_events.spec.d.ts.map +1 -0
  196. package/build/tests/attachment_events.spec.js +65 -0
  197. package/build/tests/attachment_events.spec.js.map +1 -0
  198. package/build/tests/attachment_job_processor.spec.js +77 -2
  199. package/build/tests/attachment_job_processor.spec.js.map +1 -1
  200. package/build/tests/attachment_provider.spec.js +84 -1
  201. package/build/tests/attachment_provider.spec.js.map +1 -1
  202. package/build/tests/attachment_schema_service.spec.d.ts +8 -0
  203. package/build/tests/attachment_schema_service.spec.d.ts.map +1 -0
  204. package/build/tests/attachment_schema_service.spec.js +52 -0
  205. package/build/tests/attachment_schema_service.spec.js.map +1 -0
  206. package/build/tests/attachment_service.spec.js +81 -2
  207. package/build/tests/attachment_service.spec.js.map +1 -1
  208. package/build/tests/attachment_table_names.spec.d.ts +8 -0
  209. package/build/tests/attachment_table_names.spec.d.ts.map +1 -0
  210. package/build/tests/attachment_table_names.spec.js +36 -0
  211. package/build/tests/attachment_table_names.spec.js.map +1 -0
  212. package/build/tests/attachments_table_stub.spec.js +41 -6
  213. package/build/tests/attachments_table_stub.spec.js.map +1 -1
  214. package/build/tests/autodetect_converter.spec.d.ts +8 -0
  215. package/build/tests/autodetect_converter.spec.d.ts.map +1 -0
  216. package/build/tests/autodetect_converter.spec.js +55 -0
  217. package/build/tests/autodetect_converter.spec.js.map +1 -0
  218. package/build/tests/binary_media.spec.d.ts +8 -0
  219. package/build/tests/binary_media.spec.d.ts.map +1 -0
  220. package/build/tests/binary_media.spec.js +106 -0
  221. package/build/tests/binary_media.spec.js.map +1 -0
  222. package/build/tests/blurhash_media.spec.d.ts +8 -0
  223. package/build/tests/blurhash_media.spec.d.ts.map +1 -0
  224. package/build/tests/blurhash_media.spec.js +40 -0
  225. package/build/tests/blurhash_media.spec.js.map +1 -0
  226. package/build/tests/configure.spec.js +1 -0
  227. package/build/tests/configure.spec.js.map +1 -1
  228. package/build/tests/configured_variant_converter_registry.spec.d.ts +8 -0
  229. package/build/tests/configured_variant_converter_registry.spec.d.ts.map +1 -0
  230. package/build/tests/configured_variant_converter_registry.spec.js +73 -0
  231. package/build/tests/configured_variant_converter_registry.spec.js.map +1 -0
  232. package/build/tests/converter_config.types.d.ts +36 -0
  233. package/build/tests/converter_config.types.d.ts.map +1 -0
  234. package/build/tests/converter_config.types.js +60 -0
  235. package/build/tests/converter_config.types.js.map +1 -0
  236. package/build/tests/define_config.spec.js +113 -0
  237. package/build/tests/define_config.spec.js.map +1 -1
  238. package/build/tests/errors.spec.d.ts +8 -0
  239. package/build/tests/errors.spec.d.ts.map +1 -0
  240. package/build/tests/errors.spec.js +43 -0
  241. package/build/tests/errors.spec.js.map +1 -0
  242. package/build/tests/exif_media.spec.d.ts +8 -0
  243. package/build/tests/exif_media.spec.d.ts.map +1 -0
  244. package/build/tests/exif_media.spec.js +50 -0
  245. package/build/tests/exif_media.spec.js.map +1 -0
  246. package/build/tests/helpers/lucid_test_database.d.ts.map +1 -1
  247. package/build/tests/helpers/lucid_test_database.js +17 -7
  248. package/build/tests/helpers/lucid_test_database.js.map +1 -1
  249. package/build/tests/legacy_attachment_migration_stub.spec.d.ts +8 -0
  250. package/build/tests/legacy_attachment_migration_stub.spec.d.ts.map +1 -0
  251. package/build/tests/legacy_attachment_migration_stub.spec.js +57 -0
  252. package/build/tests/legacy_attachment_migration_stub.spec.js.map +1 -0
  253. package/build/tests/lucid_attachment_collection_store.spec.js +5 -4
  254. package/build/tests/lucid_attachment_collection_store.spec.js.map +1 -1
  255. package/build/tests/lucid_attachment_column.spec.js +1 -1
  256. package/build/tests/lucid_attachment_column.spec.js.map +1 -1
  257. package/build/tests/lucid_attachment_lifecycle_service.spec.js +144 -256
  258. package/build/tests/lucid_attachment_lifecycle_service.spec.js.map +1 -1
  259. package/build/tests/lucid_attachment_metadata_persister.spec.d.ts +8 -0
  260. package/build/tests/lucid_attachment_metadata_persister.spec.d.ts.map +1 -0
  261. package/build/tests/lucid_attachment_metadata_persister.spec.js +34 -0
  262. package/build/tests/lucid_attachment_metadata_persister.spec.js.map +1 -0
  263. package/build/tests/lucid_attachment_relation.spec.js +167 -27
  264. package/build/tests/lucid_attachment_relation.spec.js.map +1 -1
  265. package/build/tests/lucid_attachment_repository.spec.js +1 -1
  266. package/build/tests/lucid_attachment_repository.spec.js.map +1 -1
  267. package/build/tests/lucid_attachment_store.spec.js +24 -52
  268. package/build/tests/lucid_attachment_store.spec.js.map +1 -1
  269. package/build/tests/lucid_sqlite_integration.spec.js +24 -18
  270. package/build/tests/lucid_sqlite_integration.spec.js.map +1 -1
  271. package/build/tests/lucid_variant_generation_service.spec.js +18 -1
  272. package/build/tests/lucid_variant_generation_service.spec.js.map +1 -1
  273. package/build/tests/make_converter.spec.d.ts +8 -0
  274. package/build/tests/make_converter.spec.d.ts.map +1 -0
  275. package/build/tests/make_converter.spec.js +32 -0
  276. package/build/tests/make_converter.spec.js.map +1 -0
  277. package/build/tests/media_metadata.spec.d.ts +8 -0
  278. package/build/tests/media_metadata.spec.d.ts.map +1 -0
  279. package/build/tests/media_metadata.spec.js +51 -0
  280. package/build/tests/media_metadata.spec.js.map +1 -0
  281. package/build/tests/migrate_legacy_attachment.spec.js +62 -47
  282. package/build/tests/migrate_legacy_attachment.spec.js.map +1 -1
  283. package/build/tests/migrate_legacy_attachment_records.spec.js +4 -3
  284. package/build/tests/migrate_legacy_attachment_records.spec.js.map +1 -1
  285. package/build/tests/package_exports.spec.js +18 -2
  286. package/build/tests/package_exports.spec.js.map +1 -1
  287. package/build/tests/sharp_media.spec.d.ts +8 -0
  288. package/build/tests/sharp_media.spec.d.ts.map +1 -0
  289. package/build/tests/sharp_media.spec.js +84 -0
  290. package/build/tests/sharp_media.spec.js.map +1 -0
  291. package/build/tests/v5_metadata.spec.d.ts +8 -0
  292. package/build/tests/v5_metadata.spec.d.ts.map +1 -0
  293. package/build/tests/v5_metadata.spec.js +19 -0
  294. package/build/tests/v5_metadata.spec.js.map +1 -0
  295. package/build/tests/variant_generation_service.spec.js +122 -0
  296. package/build/tests/variant_generation_service.spec.js.map +1 -1
  297. package/package.json +50 -2
  298. package/build/src/integrations/lucid/attachment_column.d.ts.map +0 -1
  299. package/build/src/integrations/lucid/attachment_column.js.map +0 -1
  300. package/build/src/integrations/lucid/attachment_model.d.ts.map +0 -1
  301. package/build/src/integrations/lucid/attachment_model.js.map +0 -1
  302. package/build/src/integrations/lucid/attachment_owner.d.ts.map +0 -1
  303. package/build/src/integrations/lucid/attachment_owner.js.map +0 -1
  304. package/build/src/integrations/lucid/attachment_relation.d.ts.map +0 -1
  305. package/build/src/integrations/lucid/attachment_relation.js +0 -163
  306. package/build/src/integrations/lucid/attachment_relation.js.map +0 -1
  307. package/build/src/integrations/lucid/attachments_table_stub.d.ts.map +0 -1
  308. package/build/src/integrations/lucid/attachments_table_stub.js.map +0 -1
  309. package/build/src/integrations/lucid/create_legacy_attachment_migration_script.d.ts +0 -13
  310. package/build/src/integrations/lucid/create_legacy_attachment_migration_script.d.ts.map +0 -1
  311. package/build/src/integrations/lucid/create_legacy_attachment_migration_script.js +0 -20
  312. package/build/src/integrations/lucid/create_legacy_attachment_migration_script.js.map +0 -1
  313. package/build/src/integrations/lucid/lucid_attachment_lifecycle_service.d.ts.map +0 -1
  314. package/build/src/integrations/lucid/lucid_attachment_lifecycle_service.js +0 -188
  315. package/build/src/integrations/lucid/lucid_attachment_lifecycle_service.js.map +0 -1
  316. package/build/src/integrations/lucid/lucid_attachment_repository.d.ts.map +0 -1
  317. package/build/src/integrations/lucid/lucid_attachment_repository.js.map +0 -1
  318. package/build/src/integrations/lucid/lucid_attachment_store.d.ts +0 -36
  319. package/build/src/integrations/lucid/lucid_attachment_store.d.ts.map +0 -1
  320. package/build/src/integrations/lucid/lucid_attachment_store.js +0 -179
  321. package/build/src/integrations/lucid/lucid_attachment_store.js.map +0 -1
  322. package/build/src/integrations/lucid/lucid_variant_generation_service.d.ts.map +0 -1
  323. package/build/src/integrations/lucid/lucid_variant_generation_service.js.map +0 -1
  324. package/build/src/integrations/lucid/migrate_legacy_attachment.d.ts.map +0 -1
  325. package/build/src/integrations/lucid/migrate_legacy_attachment.js.map +0 -1
  326. package/build/src/integrations/lucid/migrate_legacy_attachment_records.d.ts.map +0 -1
  327. package/build/src/integrations/lucid/migrate_legacy_attachment_records.js.map +0 -1
  328. package/build/src/integrations/lucid/render_legacy_attachment_migration_script.d.ts +0 -11
  329. package/build/src/integrations/lucid/render_legacy_attachment_migration_script.d.ts.map +0 -1
  330. package/build/src/integrations/lucid/render_legacy_attachment_migration_script.js.map +0 -1
  331. package/build/tests/create_legacy_attachment_migration_script.spec.d.ts.map +0 -1
  332. package/build/tests/create_legacy_attachment_migration_script.spec.js +0 -31
  333. package/build/tests/create_legacy_attachment_migration_script.spec.js.map +0 -1
  334. /package/build/src/integrations/lucid/{attachment_owner.d.ts → relations/attachment_owner.d.ts} +0 -0
  335. /package/build/src/integrations/lucid/{attachment_owner.js → relations/attachment_owner.js} +0 -0
  336. /package/build/src/integrations/lucid/{attachments_table_stub.d.ts → schema/attachments_table_stub.d.ts} +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"variant_generation_service.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAyB,MAAM,uBAAuB,CAAA;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG;IAC5C,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAA;IACvD,UAAU,EAAE,SAAS,gBAAgB,EAAE,CAAA;CACxC,CAAA;AAED,qBAAa,wBAAyB,YAAW,gBAAgB;;gBAInD,OAAO,EAAE,+BAA+B;IAK9C,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,WAAW,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA0BlF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;gBACzC,GAAG,EAAE,MAAM;CAIxB"}
1
+ {"version":3,"file":"variant_generation_service.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAyB,MAAM,uBAAuB,CAAA;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wDAAwD,CAAA;AACtG,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG;IAC5C,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAA;IACzG,UAAU,EAAE,SAAS,gBAAgB,EAAE,GAAG,wBAAwB,CAAA;IAClE,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAA;AAED,qBAAa,wBAAyB,YAAW,gBAAgB;;gBAMnD,OAAO,EAAE,+BAA+B;IAU9C,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,WAAW,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA8DlF;AAED,qBAAa,4BAA6B,SAAQ,eAAe;IAC/D,MAAM,CAAC,IAAI,SAAgC;IAC3C,MAAM,CAAC,MAAM,SAAM;gBAEP,GAAG,EAAE,MAAM;CAIxB"}
@@ -4,38 +4,79 @@
4
4
  * @license MIT
5
5
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
6
6
  */
7
+ import { DynamicBlurhashGenerator, isBlurhashEnabled, resolveBlurhashComponents, } from '../media/blurhash.js';
8
+ import { AttachmentError } from '../errors.js';
7
9
  export class VariantGenerationService {
8
10
  #attachments;
9
11
  #converters;
12
+ #registry;
13
+ #blurhash;
10
14
  constructor(options) {
11
15
  this.#attachments = options.attachments;
12
- this.#converters = new Map(options.converters.map((converter) => [converter.key, converter]));
16
+ if ('get' in options.converters) {
17
+ this.#registry = options.converters;
18
+ }
19
+ else {
20
+ this.#converters = new Map(options.converters.map((converter) => [converter.key, converter]));
21
+ }
22
+ this.#blurhash = options.blurhash ?? new DynamicBlurhashGenerator();
13
23
  }
14
24
  async generate(request) {
15
25
  await this.generateAll(request);
16
26
  }
17
27
  async generateAll(request) {
18
28
  const source = await this.#attachments.read(request.attachment);
19
- const keys = request.variantKeys ?? [...this.#converters.keys()];
20
- return Promise.all(keys.map(async (key) => {
21
- const converter = this.#converters.get(key);
29
+ const keys = request.variantKeys ?? await this.#keys();
30
+ const generated = await Promise.all(keys.map(async (key) => {
31
+ const converter = await this.#getConverter(key);
22
32
  if (!converter) {
23
33
  throw new UnknownVariantConverterError(key);
24
34
  }
25
35
  const output = await converter.convert({ attachment: request.attachment, body: source });
36
+ if (!output) {
37
+ return undefined;
38
+ }
39
+ const blurhash = output.blurhash ?? await this.#generateBlurhash(converter, output.body);
26
40
  const input = {
27
41
  body: output.body,
28
42
  originalName: output.fileName,
29
43
  mimeType: output.mimeType,
30
44
  ...(output.folder ? { folder: output.folder } : {}),
31
45
  ...(output.metadata ? { metadata: output.metadata } : {}),
46
+ ...(blurhash ? { blurhash } : {}),
32
47
  disk: request.attachment.disk,
33
48
  };
34
- return { key, attachment: await this.#attachments.create(input) };
49
+ return { key, attachment: await this.#persistVariant(input, request.meta) };
35
50
  }));
51
+ return generated.filter((variant) => variant !== undefined);
52
+ }
53
+ #keys() {
54
+ return this.#registry?.keys() ?? Promise.resolve([...this.#converters.keys()]);
55
+ }
56
+ #getConverter(key) {
57
+ return this.#registry?.get(key) ?? Promise.resolve(this.#converters.get(key));
58
+ }
59
+ #persistVariant(input, meta) {
60
+ if (meta && this.#attachments.createDraft) {
61
+ return this.#attachments.createDraft(input).persist({ options: { meta: true } });
62
+ }
63
+ return this.#attachments.create(input);
64
+ }
65
+ async #generateBlurhash(converter, body) {
66
+ if (!isBlurhashEnabled(converter.blurhash)) {
67
+ return undefined;
68
+ }
69
+ try {
70
+ return await this.#blurhash.generate({ body, ...resolveBlurhashComponents(converter.blurhash) });
71
+ }
72
+ catch {
73
+ return undefined;
74
+ }
36
75
  }
37
76
  }
38
- export class UnknownVariantConverterError extends Error {
77
+ export class UnknownVariantConverterError extends AttachmentError {
78
+ static code = 'E_UNKNOWN_VARIANT_CONVERTER';
79
+ static status = 422;
39
80
  constructor(key) {
40
81
  super(`No variant converter is registered for "${key}"`);
41
82
  this.name = 'UnknownVariantConverterError';
@@ -1 +1 @@
1
- {"version":3,"file":"variant_generation_service.js","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAiBH,MAAM,OAAO,wBAAwB;IAC1B,YAAY,CAA4C;IACxD,WAAW,CAA+B;IAEnD,YAAY,OAAwC;QAClD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAA;QACvC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;IAC/F,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAiC;QAC9C,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiC;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAC/D,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;QAEhE,OAAO,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAE3C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,4BAA4B,CAAC,GAAG,CAAC,CAAA;YAC7C,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YACxF,MAAM,KAAK,GAA0B;gBACnC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,YAAY,EAAE,MAAM,CAAC,QAAQ;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;aAC9B,CAAA;YAED,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;QACnE,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,KAAK;IACrD,YAAY,GAAW;QACrB,KAAK,CAAC,2CAA2C,GAAG,GAAG,CAAC,CAAA;QACxD,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAA;IAC5C,CAAC;CACF"}
1
+ {"version":3,"file":"variant_generation_service.js","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,33 @@
1
1
  {{{
2
2
  exports({ to: app.configPath('attachment.ts') })
3
3
  }}}
4
- import { defineConfig, LocalFileStorage } from '@jrmc/adonis-attachment'
4
+ import {
5
+ defineConfig,
6
+ LocalFileStorage,
7
+ type InferConverters,
8
+ } from '@jrmc/adonis-attachment'
9
+ import { createV5CompatibleMetadataExtractors } from '@jrmc/adonis-attachment/media/metadata'
5
10
 
6
11
  /**
7
12
  * Attachments are stored locally by default. Lucid, Drive, external queues,
8
13
  * custom storage, and read routes can be added as the application needs them.
9
14
  */
10
- export default defineConfig({
15
+ const attachmentConfig = defineConfig({
11
16
  storage: LocalFileStorage.fromApp,
17
+ media: {
18
+ metadata: createV5CompatibleMetadataExtractors(),
19
+ // metadataPolicy: { mode: 'deferred', variants: false },
20
+ },
21
+ // converters: {
22
+ // thumbnail: {
23
+ // width: 320,
24
+ // format: 'webp',
25
+ // },
26
+ // },
12
27
  })
28
+
29
+ export default attachmentConfig
30
+
31
+ declare module '@jrmc/adonis-attachment' {
32
+ interface AttachmentVariants extends InferConverters<typeof attachmentConfig> {}
33
+ }
@@ -0,0 +1,18 @@
1
+ {{#var entity = generators.createEntity(name)}}
2
+ {{#var className = string(entity.name).removeSuffix('converter').pascalCase().suffix('Converter').toString()}}
3
+ {{#var fileName = string(entity.name).snakeCase().suffix('_converter').ext('.ts').toString()}}
4
+ {{{ exports({ to: app.makePath('app/converters', entity.path, fileName) }) }}}
5
+
6
+ import Converter, {
7
+ type ConverterAttributes,
8
+ } from '@jrmc/adonis-attachment'
9
+
10
+ export default class {{ className }} extends Converter {
11
+ async handle({ attachment, body }: ConverterAttributes) {
12
+ return {
13
+ body,
14
+ fileName: attachment.name,
15
+ mimeType: attachment.mimeType,
16
+ }
17
+ }
18
+ }
@@ -2,38 +2,20 @@
2
2
  exports({ to: destination })
3
3
  }}}
4
4
  import { BaseSchema } from '@adonisjs/lucid/schema'
5
+ import { AttachmentSchemaService } from '@jrmc/adonis-attachment/lucid'
5
6
 
6
7
  export default class Create{{ className }}Table extends BaseSchema {
7
8
  protected tableName = '{{ tableName }}'
8
9
 
9
10
  async up() {
10
- this.schema.createTable(this.tableName, (table) => {
11
- table.uuid('id').primary()
12
- table.string('attachable_type').notNullable()
13
- table.string('attachable_id').notNullable()
14
- table.string('field').notNullable()
15
- table.string('owner_key', 64).nullable().unique()
16
- table.integer('position').unsigned().nullable()
17
- table.uuid('parent_id').nullable().references('id').inTable(this.tableName).onDelete('CASCADE')
18
- table.string('variant_key').nullable()
19
- table.string('disk').notNullable()
20
- table.string('path').notNullable()
21
- table.string('name').notNullable()
22
- table.string('original_name').notNullable()
23
- table.string('mime_type').notNullable()
24
- table.string('extname').notNullable()
25
- table.bigInteger('size').unsigned().notNullable()
26
- table.json('metadata').nullable()
27
- table.timestamp('created_at').notNullable()
28
- table.timestamp('updated_at').notNullable()
29
-
30
- table.index(['attachable_type', 'attachable_id', 'field'])
31
- table.index(['parent_id'])
32
- table.unique(['parent_id', 'variant_key'])
33
- })
11
+ await new AttachmentSchemaService(this.db.getWriteClient(), {
12
+ tableName: this.tableName,
13
+ }).createTables()
34
14
  }
35
15
 
36
16
  async down() {
37
- this.schema.dropTable(this.tableName)
17
+ await new AttachmentSchemaService(this.db.getWriteClient(), {
18
+ tableName: this.tableName,
19
+ }).dropTables()
38
20
  }
39
21
  }
@@ -1,15 +1,11 @@
1
- /**
2
- * @jrmc/adonis-attachment
3
- *
4
- * @license MIT
5
- * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
6
- */
7
- export function renderLegacyAttachmentMigrationScript(options = {}) {
8
- const defaultDisk = options.defaultDisk ?? 'public';
9
- return `import { randomUUID } from 'node:crypto'
1
+ {{{
2
+ exports({ to: destination })
3
+ }}}
4
+ import { randomUUID } from 'node:crypto'
10
5
 
11
6
  import {
12
7
  AttachmentModel,
8
+ AttachmentLinkModel,
13
9
  migrateLegacyAttachmentRecords,
14
10
  type LegacyAttachmentMigrationRecord,
15
11
  } from '@jrmc/adonis-attachment/lucid'
@@ -17,15 +13,20 @@ import {
17
13
  async function main(): Promise<void> {
18
14
  const result = await migrateLegacyAttachmentRecords({
19
15
  records: legacyAttachmentRecords(),
20
- defaultDisk: '${defaultDisk}',
16
+ defaultDisk: '{{ defaultDisk }}',
21
17
  createId: randomUUID,
22
18
  writer: {
23
- insert: (rows) => AttachmentModel.createMany(rows),
19
+ async insert(rows) {
20
+ await AttachmentModel.transaction(async (trx) => {
21
+ await AttachmentModel.createMany(rows.blobs, { client: trx })
22
+ await AttachmentLinkModel.createMany(rows.links, { client: trx })
23
+ })
24
+ },
24
25
  },
25
26
  })
26
27
 
27
28
  console.info(
28
- \`Migrated \${result.attachments} attachments and \${result.variants} variants; skipped \${result.skipped} empty values.\`
29
+ `Migrated ${result.attachments} attachments and ${result.variants} variants; skipped ${result.skipped} empty values.`
29
30
  )
30
31
  }
31
32
 
@@ -36,6 +37,3 @@ async function* legacyAttachmentRecords(): AsyncGenerator<LegacyAttachmentMigrat
36
37
  }
37
38
 
38
39
  void main()
39
- `;
40
- }
41
- //# sourceMappingURL=render_legacy_attachment_migration_script.js.map
@@ -5,7 +5,7 @@
5
5
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
6
6
  */
7
7
  import { test } from '@japa/runner';
8
- import { AdonisAttachmentQueue } from '../index.js';
8
+ import { AdonisAttachmentQueue, AttachmentJobProcessor, } from '../index.js';
9
9
  test.group('AdonisAttachmentQueue', () => {
10
10
  test('dispatches an attachment job to the configured queue', async ({ assert }) => {
11
11
  const calls = [];
@@ -48,5 +48,60 @@ test.group('AdonisAttachmentQueue', () => {
48
48
  await queue.enqueue({ type: 'generate-variants', attachmentId: 'attachment-id' });
49
49
  assert.deepEqual(calls, ['run']);
50
50
  });
51
+ test('preserves the serialized payload through an external worker', async ({ assert }) => {
52
+ const attachment = {
53
+ id: 'attachment-id',
54
+ disk: 'public',
55
+ name: 'attachment-id.jpg',
56
+ originalName: 'avatar.jpg',
57
+ path: 'users/42/attachment-id.jpg',
58
+ size: 3,
59
+ extname: 'jpg',
60
+ mimeType: 'image/jpeg',
61
+ };
62
+ const generated = [];
63
+ const processor = new AttachmentJobProcessor({
64
+ attachments: {
65
+ async findById(id) {
66
+ return id === attachment.id ? attachment : null;
67
+ },
68
+ },
69
+ variants: {
70
+ async generate(request) {
71
+ generated.push(request);
72
+ },
73
+ },
74
+ });
75
+ let payload;
76
+ const queue = new AdonisAttachmentQueue({
77
+ queue: 'attachments',
78
+ job: {
79
+ dispatch(job) {
80
+ payload = JSON.parse(JSON.stringify(job));
81
+ return {
82
+ toQueue() {
83
+ return this;
84
+ },
85
+ async run() {
86
+ await processor.process(payload);
87
+ },
88
+ };
89
+ },
90
+ },
91
+ });
92
+ await queue.enqueue({
93
+ type: 'generate-variants',
94
+ attachmentId: attachment.id,
95
+ variantKeys: ['thumbnail'],
96
+ meta: true,
97
+ });
98
+ assert.deepEqual(payload, {
99
+ type: 'generate-variants',
100
+ attachmentId: attachment.id,
101
+ variantKeys: ['thumbnail'],
102
+ meta: true,
103
+ });
104
+ assert.deepEqual(generated, [{ attachment, variantKeys: ['thumbnail'], meta: true }]);
105
+ });
51
106
  });
52
107
  //# sourceMappingURL=adonis_queue.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"adonis_queue.spec.js","sourceRoot":"","sources":["../../tests/adonis_queue.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAEnD,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACvC,IAAI,CAAC,sDAAsD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChF,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC;YACtC,KAAK,EAAE,aAAa;YACpB,GAAG,EAAE;gBACH,QAAQ,CAAC,OAAO;oBACd,KAAK,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,YAAY,EAAE,CAAC,CAAA;oBAC9C,OAAO;wBACL,OAAO,CAAC,IAAI;4BACV,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;4BAC3B,OAAO,IAAI,CAAA;wBACb,CAAC;wBACD,KAAK,CAAC,GAAG;4BACP,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;wBACnB,CAAC;qBACF,CAAA;gBACH,CAAC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAAA;QAEjF,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,wBAAwB,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAA;IACjF,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,6DAA6D,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACvF,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC;YACtC,GAAG,EAAE;gBACH,QAAQ;oBACN,OAAO;wBACL,OAAO;4BACL,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;wBAC9C,CAAC;wBACD,KAAK,CAAC,GAAG;4BACP,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;wBACnB,CAAC;qBACF,CAAA;gBACH,CAAC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAAA;QAEjF,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"adonis_queue.spec.js","sourceRoot":"","sources":["../../tests/adonis_queue.spec.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ /**
2
+ * @jrmc/adonis-attachment
3
+ *
4
+ * @license MIT
5
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
6
+ */
7
+ export {};
8
+ //# sourceMappingURL=attachment_events.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"attachment_events.spec.d.ts","sourceRoot":"","sources":["../../tests/attachment_events.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
@@ -0,0 +1,65 @@
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 { AttachmentService, } from '../index.js';
9
+ class FakeEmitter {
10
+ events = [];
11
+ emit(name, payload) {
12
+ this.events.push({ name, payload });
13
+ }
14
+ }
15
+ const storage = {
16
+ async write() { },
17
+ async read() {
18
+ return new Uint8Array();
19
+ },
20
+ async remove() { },
21
+ };
22
+ const queue = { async enqueue() { } };
23
+ test.group('Attachment events', () => {
24
+ test('emits file and synchronous metadata lifecycle events', async ({ assert }) => {
25
+ const events = new FakeEmitter();
26
+ const attachments = new AttachmentService({
27
+ storage,
28
+ queue,
29
+ events,
30
+ defaultDisk: 'fs',
31
+ createId: () => 'attachment-id',
32
+ metadataExtractors: [{ async extract() { return { width: 320 }; } }],
33
+ });
34
+ const attachment = await attachments.createDraft({
35
+ body: new Uint8Array([1]),
36
+ originalName: 'avatar.png',
37
+ }, { meta: true }).persist();
38
+ await attachments.remove(attachment);
39
+ assert.deepEqual(events.events.map(({ name }) => name), [
40
+ 'attachment:metadata_started',
41
+ 'attachment:metadata_completed',
42
+ 'attachment:created',
43
+ 'attachment:deleted',
44
+ ]);
45
+ assert.equal(events.events[2]?.payload.attachment.id, 'attachment-id');
46
+ });
47
+ test('does not allow a failing observer to fail the attachment operation', async ({ assert }) => {
48
+ const attachments = new AttachmentService({
49
+ storage,
50
+ queue,
51
+ defaultDisk: 'fs',
52
+ events: {
53
+ emit() {
54
+ throw new Error('observer unavailable');
55
+ },
56
+ },
57
+ });
58
+ const attachment = await attachments.create({
59
+ body: new Uint8Array([1]),
60
+ originalName: 'avatar.png',
61
+ });
62
+ assert.equal(attachment.name.endsWith('.png'), true);
63
+ });
64
+ });
65
+ //# sourceMappingURL=attachment_events.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"attachment_events.spec.js","sourceRoot":"","sources":["../../tests/attachment_events.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EACL,iBAAiB,GAMlB,MAAM,aAAa,CAAA;AAEpB,MAAM,WAAW;IACf,MAAM,GAA0E,EAAE,CAAA;IAElF,IAAI,CAAC,IAAyB,EAAE,OAA+B;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IACrC,CAAC;CACF;AAED,MAAM,OAAO,GAAsB;IACjC,KAAK,CAAC,KAAK,KAAI,CAAC;IAChB,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,UAAU,EAAE,CAAA;IACzB,CAAC;IACD,KAAK,CAAC,MAAM,KAAI,CAAC;CAClB,CAAA;AAED,MAAM,KAAK,GAAoB,EAAE,KAAK,CAAC,OAAO,KAAI,CAAC,EAAE,CAAA;AAErD,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACnC,IAAI,CAAC,sDAAsD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChF,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAA;QAChC,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,OAAO;YACP,KAAK;YACL,MAAM;YACN,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,eAAe;YAC/B,kBAAkB,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA,CAAC,CAAC,EAAE,CAAC;SACpE,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC;YAC/C,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,YAAY,EAAE,YAAY;SAC3B,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;QAC5B,MAAM,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEpC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;YACtD,6BAA6B;YAC7B,+BAA+B;YAC/B,oBAAoB;YACpB,oBAAoB;SACrB,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,oEAAoE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9F,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,OAAO;YACP,KAAK;YACL,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE;gBACN,IAAI;oBACF,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBACzC,CAAC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,YAAY,EAAE,YAAY;SAC3B,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
@@ -5,7 +5,7 @@
5
5
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
6
6
  */
7
7
  import { test } from '@japa/runner';
8
- import { AttachmentJobProcessor, AttachmentNotFoundError, } from '../index.js';
8
+ import { AttachmentJobProcessor, AttachmentNotFoundError, DeferredMetadataProcessorNotConfiguredError, } from '../index.js';
9
9
  const attachment = {
10
10
  id: 'attachment-id',
11
11
  disk: 'public',
@@ -31,6 +31,12 @@ class FakeVariantGenerator {
31
31
  this.requests.push(request);
32
32
  }
33
33
  }
34
+ class FakeEmitter {
35
+ events = [];
36
+ emit(name, payload) {
37
+ this.events.push({ name, payload });
38
+ }
39
+ }
34
40
  test.group('AttachmentJobProcessor', () => {
35
41
  test('resolves an attachment before delegating variant generation', async ({ assert }) => {
36
42
  const variants = new FakeVariantGenerator();
@@ -42,8 +48,9 @@ test.group('AttachmentJobProcessor', () => {
42
48
  type: 'generate-variants',
43
49
  attachmentId: 'attachment-id',
44
50
  variantKeys: ['thumbnail'],
51
+ meta: true,
45
52
  });
46
- assert.deepEqual(variants.requests, [{ attachment, variantKeys: ['thumbnail'] }]);
53
+ assert.deepEqual(variants.requests, [{ attachment, variantKeys: ['thumbnail'], meta: true }]);
47
54
  });
48
55
  test('fails a job when its attachment no longer exists', async ({ assert }) => {
49
56
  const processor = new AttachmentJobProcessor({
@@ -85,5 +92,73 @@ test.group('AttachmentJobProcessor', () => {
85
92
  assert.equal(resolutions, 1);
86
93
  assert.deepEqual(requests, ['first-id', 'second-id']);
87
94
  });
95
+ test('delegates deferred metadata jobs without resolving the repository', async ({ assert }) => {
96
+ const processed = [];
97
+ const processor = new AttachmentJobProcessor({
98
+ attachments: new FakeRepository(null),
99
+ variants: new FakeVariantGenerator(),
100
+ metadata: {
101
+ async extractAndPersistMetadata(value) {
102
+ processed.push(value);
103
+ },
104
+ },
105
+ });
106
+ await processor.process({ type: 'extract-metadata', attachmentId: attachment.id, attachment });
107
+ assert.deepEqual(processed, [attachment]);
108
+ });
109
+ test('preserves the v5 variant events and adds the failed job error', async ({ assert }) => {
110
+ const events = new FakeEmitter();
111
+ const variants = new FakeVariantGenerator();
112
+ const processor = new AttachmentJobProcessor({
113
+ attachments: new FakeRepository(attachment),
114
+ variants,
115
+ events,
116
+ });
117
+ const eventContext = {
118
+ tableName: 'users',
119
+ attributeName: 'avatar',
120
+ primary: { key: 'id', value: '42' },
121
+ };
122
+ await processor.process({
123
+ type: 'generate-variants',
124
+ attachmentId: attachment.id,
125
+ variantKeys: ['thumbnail'],
126
+ eventContext,
127
+ });
128
+ assert.deepEqual(events.events.map(({ name }) => name), [
129
+ 'attachment:variant_started',
130
+ 'attachment:variant_completed',
131
+ ]);
132
+ assert.deepEqual(events.events[0]?.payload, {
133
+ ...eventContext,
134
+ attachment,
135
+ variants: ['thumbnail'],
136
+ });
137
+ const failed = new AttachmentJobProcessor({
138
+ attachments: new FakeRepository(attachment),
139
+ events,
140
+ variants: {
141
+ async generate() {
142
+ throw Object.assign(new Error('conversion failed'), { code: 'E_CONVERSION_FAILED' });
143
+ },
144
+ },
145
+ });
146
+ await assert.rejects(() => failed.process({ type: 'generate-variants', attachmentId: attachment.id, eventContext }), 'conversion failed');
147
+ assert.deepEqual(events.events.at(-1), {
148
+ name: 'attachment:variant_failed',
149
+ payload: {
150
+ ...eventContext,
151
+ attachment,
152
+ error: { message: 'conversion failed', code: 'E_CONVERSION_FAILED' },
153
+ },
154
+ });
155
+ });
156
+ test('rejects deferred metadata jobs without a metadata processor', async ({ assert }) => {
157
+ const processor = new AttachmentJobProcessor({
158
+ attachments: new FakeRepository(attachment),
159
+ variants: new FakeVariantGenerator(),
160
+ });
161
+ await assert.rejects(() => processor.process({ type: 'extract-metadata', attachmentId: attachment.id, attachment }), DeferredMetadataProcessorNotConfiguredError);
162
+ });
88
163
  });
89
164
  //# sourceMappingURL=attachment_job_processor.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"attachment_job_processor.spec.js","sourceRoot":"","sources":["../../tests/attachment_job_processor.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"attachment_job_processor.spec.js","sourceRoot":"","sources":["../../tests/attachment_job_processor.spec.ts"],"names":[],"mappings":"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"}