@mearl/preset 3.0.1 → 3.0.2

package/dist/bundleStore.d.ts

@@ -63,6 +63,7 @@ export declare class BrowserBundleStore {
         installation?: BrowserPresetInstallation;
         expectedInstallationToken: string | null;
     }, expectedBundleRevisions?: Record<string, string>): Promise<void>;
+    uninstallPreset(expectedRevision: string, expectedInstallationToken: string | null): Promise<void>;
     /** Verifies all resources before a compare-and-swap transaction replaces the active snapshot. */
     install(bundle: PreparedBundle, expectedRevision: string | null, expectedBundleRevisions?: Record<string, string>): Promise<void>;
     remove(id: string, expectedRevision: string): Promise<void>;

package/dist/bundleStore.js

@@ -1,8 +1,11 @@
-import { BundleError, MAX_BUNDLE_BYTES, MAX_BROWSER_STORAGE_BYTES, MAX_PAGE_RUNTIME_BYTES, bundleDigest, verifyBundle } from './bundle.js';
-import { verifyBrowserPreset, verifyPreparedBrowserPreset } from './browserPreset.js';
+import { BundleError, MAX_BUNDLE_BYTES, MAX_BROWSER_STORAGE_BYTES, MAX_PAGE_RUNTIME_BYTES, bundleDigest, verifyBundle, } from './bundle.js';
+import { verifyBrowserPreset, verifyPreparedBrowserPreset, } from './browserPreset.js';
 import { mergePresetDefaults } from './resolve.js';
 function installationMetadata(value) {
-    if (!value || Object.keys(value).some(key => !['revision', 'browserRevision', 'overrides'].includes(key)) || !/^[a-f0-9]{64}$/.test(value.revision) || !/^[a-f0-9]{64}$/.test(value.browserRevision))
+    if (!value ||
+        Object.keys(value).some(key => !['revision', 'browserRevision', 'overrides'].includes(key)) ||
+        !/^[a-f0-9]{64}$/.test(value.revision) ||
+        !/^[a-f0-9]{64}$/.test(value.browserRevision))
         throw new BundleError('BUNDLE_INVALID', 'Invalid browser installation identity');
     const overrides = mergePresetDefaults({}, value.overrides);
     if (new TextEncoder().encode(JSON.stringify(overrides)).byteLength > 262144)
@@ -17,18 +20,25 @@ function captureRevisions(input) {
     if (input === undefined)
         return;
     const entries = Object.entries(input);
-    if (entries.length > 64 || entries.some(([id, revision]) => !/^[a-z][a-z0-9-]{0,79}$/.test(id) || typeof revision !== 'string'))
+    if (entries.length > 64 ||
+        entries.some(([id, revision]) => !/^[a-z][a-z0-9-]{0,79}$/.test(id) || typeof revision !== 'string'))
         throw new BundleError('BUNDLE_INVALID', 'Invalid expected browser bundle selection');
     return Object.fromEntries(entries);
 }
 function checkRevisions(records, expected) {
-    if (expected && (records.length !== Object.keys(expected).length || records.some(record => !Object.hasOwn(expected, record.id) || expected[record.id] !== record.revision)))
+    if (expected &&
+        (records.length !== Object.keys(expected).length ||
+            records.some(record => !Object.hasOwn(expected, record.id) || expected[record.id] !== record.revision)))
         throw new BundleError('BUNDLE_CONFLICT', 'Browser bundles changed while contributions were being validated');
 }
 function storedBundle(bundle) {
     const { resources, ...metadata } = bundle;
-    return { id: bundle.manifest.id, revision: bundle.revision,
-        byteLength: Object.values(resources).reduce((sum, bytes) => sum + bytes.byteLength, 0), bundle: metadata };
+    return {
+        id: bundle.manifest.id,
+        revision: bundle.revision,
+        byteLength: Object.values(resources).reduce((sum, bytes) => sum + bytes.byteLength, 0),
+        bundle: metadata,
+    };
 }
 function bundleObjectHashes(records) {
     const hashes = new Set();
@@ -61,13 +71,17 @@ function readObjects(records, store) {
     const hashes = bundleObjectHashes(records);
     for (const hash of hashes) {
         const request = store.get(hash);
-        request.onsuccess = () => { if (request.result)
-            result.set(hash, request.result); };
+        request.onsuccess = () => {
+            if (request.result)
+                result.set(hash, request.result);
+        };
     }
     return result;
 }
 function checkStorageBudget(records, runtimes) {
-    if (records.some(record => !Number.isSafeInteger(record.byteLength) || record.byteLength < 0 || record.byteLength > MAX_BUNDLE_BYTES) ||
+    if (records.some(record => !Number.isSafeInteger(record.byteLength) ||
+        record.byteLength < 0 ||
+        record.byteLength > MAX_BUNDLE_BYTES) ||
         runtimes.some(runtime => !(runtime.bytes instanceof Uint8Array) || runtime.bytes.byteLength > MAX_BUNDLE_BYTES)) {
         throw new BundleError('BUNDLE_INTEGRITY', 'Stored resource size is invalid');
     }
@@ -100,10 +114,16 @@ export class BrowserBundleStore {
             request.onerror = () => reject(request.error);
             request.onsuccess = () => {
                 const database = request.result;
-                database.onversionchange = () => { database.close(); this.database = undefined; };
+                database.onversionchange = () => {
+                    database.close();
+                    this.database = undefined;
+                };
                 resolve(database);
             };
-        }).catch(error => { this.database = undefined; throw error; });
+        }).catch(error => {
+            this.database = undefined;
+            throw error;
+        });
         return this.database;
     }
     async close() {
@@ -118,11 +138,19 @@ export class BrowserBundleStore {
             const transaction = database.transaction([STORE, PRESET, OBJECTS], 'readonly');
             const request = transaction.objectStore(STORE).getAll();
             let objects = new Map();
-            request.onsuccess = () => { objects = readObjects(request.result, transaction.objectStore(OBJECTS)); };
+            request.onsuccess = () => {
+                objects = readObjects(request.result, transaction.objectStore(OBJECTS));
+            };
             const active = transaction.objectStore(PRESET).get('active');
             const installation = transaction.objectStore(PRESET).get('installation');
             const token = transaction.objectStore(PRESET).get('installationToken');
-            transaction.oncomplete = () => resolve({ objects, records: request.result, active: active.result, installation: installation.result, installationToken: token.result ?? null });
+            transaction.oncomplete = () => resolve({
+                objects,
+                records: request.result,
+                active: active.result,
+                installation: installation.result,
+                installationToken: token.result ?? null,
+            });
             transaction.onabort = transaction.onerror = () => reject(transaction.error ?? new Error('Bundle read failed'));
         });
     }
@@ -132,7 +160,9 @@ export class BrowserBundleStore {
         const record = await new Promise((resolve, reject) => {
             const transaction = database.transaction([STORE, OBJECTS], 'readonly');
             const request = transaction.objectStore(STORE).get(id);
-            request.onsuccess = () => { objects = readObjects(request.result ? [request.result] : [], transaction.objectStore(OBJECTS)); };
+            request.onsuccess = () => {
+                objects = readObjects(request.result ? [request.result] : [], transaction.objectStore(OBJECTS));
+            };
             transaction.oncomplete = () => resolve(request.result);
             transaction.onabort = transaction.onerror = () => reject(transaction.error ?? new Error('Bundle read failed'));
         });
@@ -150,7 +180,8 @@ export class BrowserBundleStore {
             resources[name] = object.bytes;
         }
         const bundle = await verifyBundle({ ...record.bundle, resources }, this.options.mearlApiVersion);
-        if (Object.values(bundle.resources).reduce((sum, bytes) => sum + bytes.byteLength, 0) !== record.byteLength) {
+        if (Object.values(bundle.resources).reduce((sum, bytes) => sum + bytes.byteLength, 0) !==
+            record.byteLength) {
             throw new BundleError('BUNDLE_INTEGRITY', 'Stored resource size does not match');
         }
         return bundle;
@@ -158,13 +189,16 @@ export class BrowserBundleStore {
     async list() {
         const bundles = [];
         const errors = [];
-        const { objects, records, active, installation: storedInstallation, installationToken } = await this.records();
+        const { objects, records, active, installation: storedInstallation, installationToken, } = await this.records();
         for (const record of records) {
             try {
                 bundles.push(await this.verified(record, objects));
             }
             catch (error) {
-                errors.push({ id: record.id, error: error instanceof Error ? error.message : 'Invalid stored bundle' });
+                errors.push({
+                    id: record.id,
+                    error: error instanceof Error ? error.message : 'Invalid stored bundle',
+                });
             }
         }
         let activation;
@@ -181,8 +215,12 @@ export class BrowserBundleStore {
             }
             if (activation) {
                 for (const [id, revision] of Object.entries(activation.snapshot.bundleRevisions)) {
-                    if (!bundles.some(bundle => bundle.manifest.id === id && bundle.revision === revision) && !errors.some(error => error.id === id)) {
-                        errors.push({ id, error: 'BUNDLE_INTEGRITY: An active preset package is missing or corrupt' });
+                    if (!bundles.some(bundle => bundle.manifest.id === id && bundle.revision === revision) &&
+                        !errors.some(error => error.id === id)) {
+                        errors.push({
+                            id,
+                            error: 'BUNDLE_INTEGRITY: An active preset package is missing or corrupt',
+                        });
                     }
                 }
             }
@@ -198,8 +236,17 @@ export class BrowserBundleStore {
                 installationError = error instanceof Error ? error.message : 'Invalid browser installation';
             }
         }
-        return { bundles, errors, activation, activationError, installation, installationError, installationToken, activeRevision: active?.revision ?? null,
-            revisions: Object.fromEntries(records.map(record => [record.id, record.revision])) };
+        return {
+            bundles,
+            errors,
+            activation,
+            activationError,
+            installation,
+            installationError,
+            installationToken,
+            activeRevision: active?.revision ?? null,
+            revisions: Object.fromEntries(records.map(record => [record.id, record.revision])),
+        };
     }
     async activePreset() {
         const database = await this.open();
@@ -222,7 +269,10 @@ export class BrowserBundleStore {
             transaction.oncomplete = () => resolve(request.result);
             transaction.onabort = transaction.onerror = () => reject(transaction.error ?? new Error('Browser runtime read failed'));
         });
-        if (!(record?.bytes instanceof Uint8Array) || record.sha256 !== sha256 || record.bytes.byteLength > MAX_BUNDLE_BYTES || await bundleDigest(record.bytes) !== sha256) {
+        if (!(record?.bytes instanceof Uint8Array) ||
+            record.sha256 !== sha256 ||
+            record.bytes.byteLength > MAX_BUNDLE_BYTES ||
+            (await bundleDigest(record.bytes)) !== sha256) {
             throw new BundleError('BUNDLE_INTEGRITY', 'Pinned browser runtime is missing or corrupt');
         }
         return Uint8Array.from(record.bytes);
@@ -248,7 +298,8 @@ export class BrowserBundleStore {
     }
     async updateRuntimePins(input, replace) {
         const patch = Object.entries(input).map(([owner, sha256]) => {
-            if (!/^[a-zA-Z0-9:._-]{1,200}$/.test(owner) || sha256 !== null && !/^[a-f0-9]{64}$/.test(sha256))
+            if (!/^[a-zA-Z0-9:._-]{1,200}$/.test(owner) ||
+                (sha256 !== null && !/^[a-f0-9]{64}$/.test(sha256)))
                 throw new BundleError('BUNDLE_INVALID', 'Invalid page runtime reference');
             return { owner, sha256 };
         });
@@ -302,7 +353,9 @@ export class BrowserBundleStore {
             const transaction = database.transaction([PRESET, STORE, OBJECTS], 'readonly');
             const current = transaction.objectStore(PRESET).get('active');
             const bundle = transaction.objectStore(STORE).get(id);
-            bundle.onsuccess = () => { objects = readObjects(bundle.result ? [bundle.result] : [], transaction.objectStore(OBJECTS)); };
+            bundle.onsuccess = () => {
+                objects = readObjects(bundle.result ? [bundle.result] : [], transaction.objectStore(OBJECTS));
+            };
             transaction.oncomplete = () => {
                 if (current.result?.revision !== activation.snapshot.revision) {
                     reject(new BundleError('BUNDLE_CONFLICT', 'The selected preset changed during profile lookup'));
@@ -320,10 +373,18 @@ export class BrowserBundleStore {
     /** Packages and the exact preset graph become visible together, after host contribution checks. */
     async activatePreset(input, replacements, expectedRevision, association, expectedBundleRevisions) {
         const selection = captureRevisions(expectedBundleRevisions);
-        const accepted = association?.installation && { installation: installationMetadata(association.installation), expected: association.expectedInstallationToken };
-        if (association && association.expectedInstallationToken !== null && !/^[a-f0-9]{64}$/.test(association.expectedInstallationToken) || accepted && accepted.installation.browserRevision !== input.revision)
+        const accepted = association?.installation && {
+            installation: installationMetadata(association.installation),
+            expected: association.expectedInstallationToken,
+        };
+        if ((association &&
+            association.expectedInstallationToken !== null &&
+            !/^[a-f0-9]{64}$/.test(association.expectedInstallationToken)) ||
+            (accepted && accepted.installation.browserRevision !== input.revision))
             throw new BundleError('BUNDLE_INVALID', 'Invalid browser installation selection');
-        if (replacements.length > 64 || replacements.reduce((total, item) => total + Object.values(item.bundle.resources).reduce((sum, bytes) => sum + bytes.byteLength, 0), 0) > MAX_BROWSER_STORAGE_BYTES) {
+        if (replacements.length > 64 ||
+            replacements.reduce((total, item) => total +
+                Object.values(item.bundle.resources).reduce((sum, bytes) => sum + bytes.byteLength, 0), 0) > MAX_BROWSER_STORAGE_BYTES) {
             throw new BundleError('BUNDLE_QUOTA', 'Preset packages exceed the browser storage budget');
         }
         const expected = replacements.map(item => item.expectedRevision);
@@ -351,14 +412,20 @@ export class BrowserBundleStore {
                     transaction.abort();
                     return;
                 }
-                if ((active.result?.revision ?? null) !== expectedRevision || association && (installation.result ?? null) !== association.expectedInstallationToken || next.some(item => (records.result.find(record => record.id === item.bundle.manifest.id)?.revision ?? null) !== item.expectedRevision)) {
+                if ((active.result?.revision ?? null) !== expectedRevision ||
+                    (association &&
+                        (installation.result ?? null) !== association.expectedInstallationToken) ||
+                    next.some(item => (records.result.find(record => record.id === item.bundle.manifest.id)?.revision ??
+                        null) !== item.expectedRevision)) {
                     failure = new BundleError('BUNDLE_CONFLICT', 'Preset or packages changed while activation was being prepared');
                     transaction.abort();
                     return;
                 }
                 const replacing = new Set(next.map(item => item.bundle.manifest.id));
                 const previousManaged = new Set(Object.keys(active.result?.bundleRevisions ?? {}));
-                if (accepted && next.some(item => !previousManaged.has(item.bundle.manifest.id) && records.result.some(record => record.id === item.bundle.manifest.id))) {
+                if (accepted &&
+                    next.some(item => !previousManaged.has(item.bundle.manifest.id) &&
+                        records.result.some(record => record.id === item.bundle.manifest.id))) {
                     failure = new BundleError('BUNDLE_CONFLICT', 'A preset package conflicts with an independently installed browser package');
                     transaction.abort();
                     return;
@@ -405,6 +472,47 @@ export class BrowserBundleStore {
             transaction.onabort = transaction.onerror = () => reject(failure ?? transaction.error ?? new Error('Preset activation failed'));
         });
     }
+    async uninstallPreset(expectedRevision, expectedInstallationToken) {
+        const selection = await this.activePreset();
+        if (selection?.snapshot.revision !== expectedRevision)
+            throw new BundleError('BUNDLE_CONFLICT', 'The browser preset changed before removal');
+        const managed = selection.snapshot.bundleRevisions;
+        const database = await this.open();
+        await new Promise((resolve, reject) => {
+            const transaction = database.transaction([STORE, PRESET, OBJECTS, PINS], 'readwrite');
+            const store = transaction.objectStore(STORE);
+            const presets = transaction.objectStore(PRESET);
+            const objects = transaction.objectStore(OBJECTS);
+            const records = store.getAll();
+            const retained = objects.getAll();
+            const pins = transaction.objectStore(PINS).getAll();
+            const token = presets.get('installationToken');
+            const active = presets.get('active');
+            let failure;
+            active.onsuccess = () => {
+                if (active.result?.revision !== expectedRevision ||
+                    (token.result ?? null) !== expectedInstallationToken) {
+                    failure = new BundleError('BUNDLE_CONFLICT', 'The browser preset changed before removal');
+                    transaction.abort();
+                    return;
+                }
+                const remaining = records.result.filter(record => {
+                    if (!Object.hasOwn(managed, record.id) || managed[record.id] !== record.revision)
+                        return true;
+                    store.delete(record.id);
+                    return false;
+                });
+                const keep = new Set(referencedObjects(remaining, retained.result, pins.result).map(object => object.sha256));
+                for (const object of retained.result)
+                    if (!keep.has(object.sha256))
+                        objects.delete(object.sha256);
+                for (const key of ['active', 'installation', 'installationToken'])
+                    presets.delete(key);
+            };
+            transaction.oncomplete = () => resolve();
+            transaction.onabort = transaction.onerror = () => reject(failure ?? transaction.error ?? new Error('Browser preset removal failed'));
+        });
+    }
     /** Verifies all resources before a compare-and-swap transaction replaces the active snapshot. */
     async install(bundle, expectedRevision, expectedBundleRevisions) {
         const selection = captureRevisions(expectedBundleRevisions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/preset",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Browser-compatible preset validation, inheritance and capability resolution for Mearl",
   "type": "module",
   "license": "Apache-2.0",