@jrmc/adonis-attachment 6.0.0-alpha.1 → 6.0.0-alpha.2

package/build/tests/helpers/lucid_test_database.js

@@ -5,7 +5,8 @@
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
 import { Database } from '@adonisjs/lucid/database';
-import { AttachmentModel } from '../../src/integrations/lucid/attachment_model.js';
+import { AttachmentModel } from '../../src/integrations/lucid/models/attachment_model.js';
+import { AttachmentLinkModel } from '../../src/integrations/lucid/models/attachment_link_model.js';
 export async function createLucidTestDatabase() {
     const database = new Database({
         connection: 'sqlite',
@@ -24,13 +25,9 @@ export async function createLucidTestDatabase() {
         },
     });
     AttachmentModel.useAdapter(database.modelAdapter());
+    AttachmentLinkModel.useAdapter(database.modelAdapter());
     await database.connection().schema.createTable('attachments', (table) => {
         table.string('id').primary();
-        table.string('attachable_type').notNullable();
-        table.string('attachable_id').notNullable();
-        table.string('field').notNullable();
-        table.string('owner_key', 64).nullable().unique();
-        table.integer('position').unsigned().nullable();
         table.string('parent_id').nullable().references('id').inTable('attachments').onDelete('CASCADE');
         table.string('variant_key').nullable();
         table.string('disk').notNullable();
@@ -43,10 +40,22 @@ export async function createLucidTestDatabase() {
         table.json('metadata').nullable();
         table.timestamp('created_at').notNullable();
         table.timestamp('updated_at').notNullable();
-        table.index(['attachable_type', 'attachable_id', 'field']);
         table.index(['parent_id']);
         table.unique(['parent_id', 'variant_key']);
     });
+    await database.connection().schema.createTable('attachment_links', (table) => {
+        table.string('id').primary();
+        table.string('attachable_type').notNullable();
+        table.string('attachable_id').notNullable();
+        table.string('field').notNullable();
+        table.string('owner_key', 64).nullable().unique();
+        table.integer('position').unsigned().nullable();
+        table.string('attachment_id').notNullable().references('id').inTable('attachments').onDelete('CASCADE');
+        table.timestamp('created_at').notNullable();
+        table.timestamp('updated_at').notNullable();
+        table.index(['attachable_type', 'attachable_id', 'field']);
+        table.index(['attachment_id']);
+    });
     return database;
 }
 //# sourceMappingURL=lucid_test_database.js.map

package/build/tests/helpers/lucid_test_database.js.map

@@ -1 +1 @@
-{"version":3,"file":"lucid_test_database.js","sourceRoot":"","sources":["../../../tests/helpers/lucid_test_database.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAA;AAElF,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC3B;QACE,UAAU,EAAE,QAAQ;QACpB,WAAW,EAAE;YACX,MAAM,EAAE;gBACN,MAAM,EAAE,gBAAgB;gBACxB,UAAU,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;gBACpC,gBAAgB,EAAE,IAAI;aACvB;SACF;KACF,EACD,EAAE,KAAK,KAAI,CAAC,EAAW,EACvB;QACE,KAAK,CAAC,IAAI,KAAI,CAAC;QACf,KAAK,CAAC,UAAU,KAAI,CAAC;QACrB,YAAY;YACV,OAAO,KAAK,CAAA;QACd,CAAC;KACO,CACX,CAAA;IAED,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAA;IAEnD,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QACtE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAA;QAC5B,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAA;QAC7C,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;QACnC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAA;QACjD,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAA;QAC/C,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAChG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAA;QACtC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;QAClC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;QAClC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;QAClC,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAA;QACvC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAA;QACrC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAA;QACjD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;QACjC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,KAAK,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC,CAAA;QAC1D,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;QAC1B,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC"}
+{"version":3,"file":"lucid_test_database.js","sourceRoot":"","sources":["../../../tests/helpers/lucid_test_database.ts"],"names":[],"mappings":"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"}

package/build/tests/legacy_attachment_migration_stub.spec.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+export {};
+//# sourceMappingURL=legacy_attachment_migration_stub.spec.d.ts.map

package/build/tests/legacy_attachment_migration_stub.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy_attachment_migration_stub.spec.d.ts","sourceRoot":"","sources":["../../tests/legacy_attachment_migration_stub.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}

package/build/tests/legacy_attachment_migration_stub.spec.js

@@ -0,0 +1,57 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { test } from '@japa/runner';
+import MakeAttachmentV5Migration from '../commands/make/attachment_v5_migration.js';
+import { stubsRoot } from '../stubs/main.js';
+import { createLegacyAttachmentMigrationStubState } from '../src/integrations/lucid/index.js';
+test.group('legacy attachment migration stub', () => {
+    test('prepares a timestamped destination and template state', ({ assert }) => {
+        assert.deepEqual(createLegacyAttachmentMigrationStubState({
+            directory: '/app/database/scripts',
+            defaultDisk: 's3',
+            timestamp: 1700000000000,
+        }), {
+            destination: '/app/database/scripts/1700000000000_migrate_v5_attachments.ts',
+            defaultDisk: 's3',
+        });
+    });
+    test('uses a package stub for the generated data migration', async ({ assert }) => {
+        const stub = await readFile(join(stubsRoot, 'migrations/legacy_attachment_migration.stub'), 'utf8');
+        assert.include(stub, 'exports({ to: destination })');
+        assert.include(stub, "defaultDisk: '{{ defaultDisk }}'");
+        assert.include(stub, 'migrateLegacyAttachmentRecords');
+        assert.include(stub, 'AttachmentLinkModel.createMany(rows.links');
+    });
+    test('uses the package stub from the Ace command', async ({ assert }) => {
+        const generated = [];
+        const messages = [];
+        await MakeAttachmentV5Migration.prototype.run.call({
+            parsed: { flags: { disk: 's3', folder: 'database/scripts' } },
+            app: { makePath: (path) => `/app/${path}` },
+            async createCodemods() {
+                return {
+                    async makeUsingStub(root, path, state) {
+                        generated.push({ root, path, state });
+                    },
+                };
+            },
+            logger: {
+                success(message) {
+                    messages.push(message);
+                },
+            },
+        });
+        assert.equal(generated[0]?.root, stubsRoot);
+        assert.equal(generated[0]?.path, 'migrations/legacy_attachment_migration.stub');
+        assert.equal(generated[0]?.state.defaultDisk, 's3');
+        assert.match(String(generated[0]?.state.destination), /^\/app\/database\/scripts\/\d+_migrate_v5_attachments\.ts$/);
+        assert.match(messages[0] ?? '', /^Created \/app\/database\/scripts\//);
+    });
+});
+//# sourceMappingURL=legacy_attachment_migration_stub.spec.js.map

package/build/tests/legacy_attachment_migration_stub.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy_attachment_migration_stub.spec.js","sourceRoot":"","sources":["../../tests/legacy_attachment_migration_stub.spec.ts"],"names":[],"mappings":"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"}

package/build/tests/lucid_attachment_collection_store.spec.js

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner';
-import { LucidAttachmentStore } from '../src/integrations/lucid/lucid_attachment_store.js';
+import { LucidAttachmentStore } from '../src/integrations/lucid/persistence/lucid_attachment_store.js';
 import { createLucidTestDatabase } from './helpers/lucid_test_database.js';
 const owner = { type: 'users', id: 'user-1', field: 'avatars' };
 let database;
@@ -20,6 +20,7 @@ test.group('Lucid attachment collection store', (group) => {
         database = await createLucidTestDatabase();
     });
     group.each.setup(async () => {
+        await database.from('attachment_links').delete();
         await database.from('attachments').delete();
     });
     group.teardown(async () => {
@@ -30,20 +31,20 @@ test.group('Lucid attachment collection store', (group) => {
         const first = await store.createCollectionItem(owner, makeAttachment('first'));
         const third = await store.createCollectionItem(owner, makeAttachment('third'));
         const second = await store.createCollectionItem(owner, makeAttachment('second'), 1);
-        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.id, item.position]), [
+        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.attachmentId, item.position]), [
             ['first', 0],
             ['second', 1],
             ['third', 2],
         ]);
         assert.isNull(await store.findOriginal(owner));
         await store.moveCollectionItem(owner, third.id, 0);
-        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.id, item.position]), [
+        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.attachmentId, item.position]), [
             ['third', 0],
             ['first', 1],
             ['second', 2],
         ]);
         await store.removeCollectionItem(owner, first);
-        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.id, item.position]), [
+        assert.deepEqual((await store.listCollection(owner)).map((item) => [item.attachmentId, item.position]), [
             ['third', 0],
             ['second', 1],
         ]);

package/build/tests/lucid_attachment_collection_store.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"lucid_attachment_collection_store.spec.js","sourceRoot":"","sources":["../../tests/lucid_attachment_collection_store.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lucid_attachment_collection_store.spec.js","sourceRoot":"","sources":["../../tests/lucid_attachment_collection_store.spec.ts"],"names":[],"mappings":"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"}

package/build/tests/lucid_attachment_lifecycle_service.spec.js

@@ -6,7 +6,7 @@
  */
 import { test } from '@japa/runner';
 import { AttachmentService } from '../src/core/attachment_service.js';
-import { LucidAttachmentLifecycleService } from '../src/integrations/lucid/lucid_attachment_lifecycle_service.js';
+import { LucidAttachmentLifecycleService } from '../src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js';
 const attachment = {
     id: 'attachment-id',
     disk: 'public',
@@ -17,20 +17,66 @@ const attachment = {
     extname: 'jpg',
     size: 42,
 };
-function makeRow(value, id = value.id) {
+function makeBlob(value) {
+    return {
+        id: value.id,
+        toAttachment() {
+            return value;
+        },
+    };
+}
+function makeLink(value, id = `link-${value.id}`) {
+    const blob = makeBlob(value);
     return {
         id,
+        attachmentId: value.id,
+        attachment: blob,
         toAttachment() {
             return value;
         },
     };
 }
+function makeStore(overrides = {}) {
+    const link = makeLink(attachment);
+    return {
+        async createOriginal() {
+            return link;
+        },
+        async findOriginal() {
+            return null;
+        },
+        async listVariants() {
+            return [];
+        },
+        async releaseOwner() { },
+        async restoreOwner() { },
+        async remove() {
+            return [];
+        },
+        async createCollectionItem() {
+            return link;
+        },
+        async findCollectionItem() {
+            return null;
+        },
+        async listCollection() {
+            return [];
+        },
+        async moveCollectionItem() {
+            return [];
+        },
+        async removeCollectionItem() {
+            return [];
+        },
+        ...overrides,
+    };
+}
 test.group('LucidAttachmentLifecycleService', () => {
-    test('persists a manager draft before inserting its polymorphic row', async ({ assert }) => {
+    test('persists a manager draft before creating its polymorphic link', async ({ assert }) => {
         const events = [];
         const attachments = new AttachmentService({
             defaultDisk: 'fs',
-            createId: () => 'attachment-id',
+            createId: () => attachment.id,
             queue: { async enqueue() { } },
             storage: {
                 async write() {
@@ -42,60 +88,18 @@ test.group('LucidAttachmentLifecycleService', () => {
                 async remove() { },
             },
         });
-        const draft = attachments.createDraft({
-            body: new Uint8Array([1]),
-            originalName: 'profile.jpg',
-        });
-        const service = new LucidAttachmentLifecycleService(attachments, {
+        const draft = attachments.createDraft({ body: new Uint8Array([1]), originalName: 'profile.jpg' });
+        const service = new LucidAttachmentLifecycleService(attachments, makeStore({
             async createOriginal() {
-                events.push('persist');
-                return {};
-            },
-            async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [];
+                events.push('link');
+                return makeLink(attachment);
             },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
-        });
-        assert.isFalse(draft.isPersisted);
+        }));
         await service.attach({ type: 'users', id: '42', field: 'avatar' }, draft);
         assert.isTrue(draft.isPersisted);
-        assert.deepEqual(events, ['write', 'persist']);
-    });
-    test('persists the file before creating its polymorphic row', async ({ assert }) => {
-        const events = [];
-        const service = new LucidAttachmentLifecycleService({
-            async create() {
-                events.push('write');
-                return attachment;
-            },
-            async remove() { },
-        }, {
-            async createOriginal() {
-                events.push('persist');
-                return {};
-            },
-            async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
-        });
-        await service.attach({ type: 'users', id: '42', field: 'avatar' }, {
-            body: new Uint8Array(),
-            originalName: 'profile.jpg',
-        });
-        assert.deepEqual(events, ['write', 'persist']);
+        assert.deepEqual(events, ['write', 'link']);
     });
-    test('removes a new file when database persistence fails', async ({ assert }) => {
+    test('removes a new file when blob or link persistence fails', async ({ assert }) => {
         const removed = [];
         const service = new LucidAttachmentLifecycleService({
             async create() {
@@ -104,275 +108,105 @@ test.group('LucidAttachmentLifecycleService', () => {
             async remove(value) {
                 removed.push(value);
             },
-        }, {
+        }, makeStore({
             async createOriginal() {
                 throw new Error('database unavailable');
             },
-            async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
-        });
+        }));
         await assert.rejects(() => service.attach({ type: 'users', id: '42', field: 'avatar' }, {
             body: new Uint8Array(),
             originalName: 'profile.jpg',
         }), 'database unavailable');
         assert.deepEqual(removed, [attachment]);
     });
-    test('replaces the persisted row before removing the previous file', async ({ assert }) => {
+    test('replaces a link before purging its unreferenced blob', async ({ assert }) => {
         const events = [];
         const previousAttachment = { ...attachment, id: 'previous-id', path: 'users/42/previous.jpg' };
         const currentAttachment = { ...attachment, id: 'current-id', path: 'users/42/current.jpg' };
-        const previous = makeRow(previousAttachment);
-        const current = makeRow(currentAttachment);
+        const previous = makeLink(previousAttachment);
+        const current = makeLink(currentAttachment);
         const service = new LucidAttachmentLifecycleService({
             async create() {
-                events.push('write-current');
+                events.push('write');
                 return currentAttachment;
             },
             async remove(value) {
                 events.push(`remove-file:${value.id}`);
             },
-        }, {
+        }, makeStore({
             async createOriginal() {
-                events.push('persist-current');
+                events.push('create-link');
                 return current;
             },
             async findOriginal() {
                 return previous;
             },
-            async listVariants() {
-                return [];
-            },
             async releaseOwner() {
-                events.push('release-previous');
+                events.push('release-link');
             },
-            async restoreOwner() { },
-            async remove(row) {
-                events.push(`remove-row:${row.id}`);
+            async remove() {
+                events.push('remove-link');
+                return [makeBlob(previousAttachment)];
             },
-        });
-        const row = await service.replace({ type: 'users', id: '42', field: 'avatar' }, {
+        }));
+        await service.replace({ type: 'users', id: '42', field: 'avatar' }, {
             body: new Uint8Array(),
             originalName: 'profile.jpg',
         });
-        assert.equal(row, current);
         assert.deepEqual(events, [
-            'write-current',
-            'release-previous',
-            'persist-current',
-            'remove-row:previous-id',
+            'write',
+            'release-link',
+            'create-link',
+            'remove-link',
             'remove-file:previous-id',
         ]);
     });
-    test('restores the previous owner when replacement persistence fails', async ({ assert }) => {
-        const events = [];
-        const previous = makeRow(attachment, 'previous-id');
-        const currentAttachment = { ...attachment, id: 'current-id', path: 'users/42/current.jpg' };
-        const service = new LucidAttachmentLifecycleService({
-            async create() {
-                events.push('write-current');
-                return currentAttachment;
-            },
-            async remove(value) {
-                events.push(`remove-file:${value.id}`);
-            },
-        }, {
-            async createOriginal() {
-                throw new Error('database unavailable');
-            },
-            async findOriginal() {
-                return previous;
-            },
-            async listVariants() {
-                return [];
-            },
-            async releaseOwner() {
-                events.push('release-previous');
-            },
-            async restoreOwner() {
-                events.push('restore-previous');
-            },
-            async remove() { },
-        });
-        await assert.rejects(() => service.replace({ type: 'users', id: '42', field: 'avatar' }, {
-            body: new Uint8Array(),
-            originalName: 'profile.jpg',
-        }), 'database unavailable');
-        assert.deepEqual(events, [
-            'write-current',
-            'release-previous',
-            'restore-previous',
-            'remove-file:current-id',
-        ]);
-    });
-    test('detaches the original and every persisted variant', async ({ assert }) => {
-        const removedRows = [];
-        const removedFiles = [];
-        const original = makeRow(attachment);
-        const variant = makeRow({ ...attachment, id: 'variant-id', path: 'users/42/thumbnail.webp' });
-        const service = new LucidAttachmentLifecycleService({
-            async create() {
-                return attachment;
-            },
-            async remove(value) {
-                removedFiles.push(value.id);
-            },
-        }, {
-            async createOriginal() {
-                return original;
-            },
-            async findOriginal() {
-                return original;
-            },
-            async listVariants() {
-                return [variant];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove(row) {
-                removedRows.push(row.id);
-            },
-        });
-        await service.detach({ type: 'users', id: '42', field: 'avatar' });
-        assert.deepEqual(removedRows, ['attachment-id']);
-        assert.sameDeepMembers(removedFiles, ['attachment-id', 'variant-id']);
-    });
-    test('persists a collection item before inserting its polymorphic row', async ({ assert }) => {
-        const events = [];
-        const item = makeRow(attachment);
-        const service = new LucidAttachmentLifecycleService({
-            async create() {
-                events.push('write');
-                return attachment;
-            },
-            async remove() { },
-        }, {
-            async createOriginal() {
-                return item;
-            },
-            async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
-            async createCollectionItem() {
-                events.push('persist');
-                return item;
-            },
-            async findCollectionItem() {
-                return null;
-            },
-            async listCollection() {
-                return [];
-            },
-            async moveCollectionItem() {
-                return [];
-            },
-            async removeCollectionItem() { },
-        });
-        await service.add({ type: 'users', id: '42', field: 'avatars' }, {
-            body: new Uint8Array(),
-            originalName: 'profile.jpg',
-        });
-        assert.deepEqual(events, ['write', 'persist']);
-    });
-    test('removes a collection file when its database insertion fails', async ({ assert }) => {
+    test('only removes files for blobs that became unreferenced', async ({ assert }) => {
         const removed = [];
         const service = new LucidAttachmentLifecycleService({
             async create() {
                 return attachment;
             },
             async remove(value) {
-                removed.push(value);
-            },
-        }, {
-            async createOriginal() {
-                return makeRow(attachment);
+                removed.push(value.id);
             },
+        }, makeStore({
             async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
-            async createCollectionItem() {
-                throw new Error('database unavailable');
-            },
-            async findCollectionItem() {
-                return null;
+                return makeLink(attachment);
             },
-            async listCollection() {
+            async remove() {
                 return [];
             },
-            async moveCollectionItem() {
-                return [];
-            },
-            async removeCollectionItem() { },
-        });
-        await assert.rejects(() => service.add({ type: 'users', id: '42', field: 'avatars' }, {
-            body: new Uint8Array(),
-            originalName: 'profile.jpg',
-        }), 'database unavailable');
-        assert.deepEqual(removed, [attachment]);
+        }));
+        await service.detach({ type: 'users', id: '42', field: 'avatar' });
+        assert.deepEqual(removed, []);
     });
-    test('removes a collection item and its persisted variants', async ({ assert }) => {
-        const removedRows = [];
-        const removedFiles = [];
-        const item = makeRow(attachment);
-        const variant = makeRow({ ...attachment, id: 'variant-id', path: 'users/42/thumbnail.webp' });
+    test('adds and removes ordered collection links', async ({ assert }) => {
+        const item = makeLink(attachment);
+        const removed = [];
         const service = new LucidAttachmentLifecycleService({
             async create() {
                 return attachment;
             },
             async remove(value) {
-                removedFiles.push(value.id);
+                removed.push(value.id);
             },
-        }, {
-            async createOriginal() {
-                return item;
-            },
-            async findOriginal() {
-                return null;
-            },
-            async listVariants() {
-                return [variant];
-            },
-            async releaseOwner() { },
-            async restoreOwner() { },
-            async remove() { },
+        }, makeStore({
             async createCollectionItem() {
                 return item;
             },
             async findCollectionItem() {
                 return item;
             },
-            async listCollection() {
-                return [item];
-            },
-            async moveCollectionItem() {
-                return [item];
+            async removeCollectionItem() {
+                return [makeBlob(attachment)];
             },
-            async removeCollectionItem(_owner, row) {
-                removedRows.push(row.id);
-            },
-        });
-        const removed = await service.removeCollectionItem({ type: 'users', id: '42', field: 'avatars' }, attachment.id);
-        assert.isTrue(removed);
-        assert.deepEqual(removedRows, ['attachment-id']);
-        assert.sameDeepMembers(removedFiles, ['attachment-id', 'variant-id']);
+        }));
+        const added = await service.add({ type: 'users', id: '42', field: 'gallery' }, { body: new Uint8Array(), originalName: 'profile.jpg' });
+        const didRemove = await service.removeCollectionItem({ type: 'users', id: '42', field: 'gallery' }, added.id);
+        assert.equal(added.id, item.id);
+        assert.isTrue(didRemove);
+        assert.deepEqual(removed, [attachment.id]);
     });
 });
 //# sourceMappingURL=lucid_attachment_lifecycle_service.spec.js.map