@anvilkit/plugin-asset-manager 0.1.2 → 0.1.4

package/dist/adapters/extract-image-dimensions.cjs

@@ -31,17 +31,26 @@ async function extractImageDimensions(url, mimeType, options = {}) {
     if (!mimeType || !mimeType.startsWith("image/")) return;
     if ("u" < typeof Image) return;
     const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    const signal = options.signal;
+    if (signal?.aborted) return;
     return new Promise((resolve)=>{
         let settled = false;
         const image = new Image();
+        const onAbort = ()=>{
+            settle(void 0);
+        };
         const settle = (value)=>{
             if (settled) return;
             settled = true;
             image.onload = null;
             image.onerror = null;
             if (void 0 !== timer) clearTimeout(timer);
+            signal?.removeEventListener("abort", onAbort);
             resolve(value);
         };
+        signal?.addEventListener("abort", onAbort, {
+            once: true
+        });
         image.onload = ()=>{
             const width = Math.round(image.naturalWidth);
             const height = Math.round(image.naturalHeight);

package/dist/adapters/extract-image-dimensions.d.cts

@@ -12,6 +12,12 @@
 export interface ExtractImageDimensionsOptions {
     /** Abort decode after this many ms. Default 3000. */
     readonly timeoutMs?: number;
+    /**
+     * Cancels the in-flight decode. On abort the timer is cleared, the
+     * `Image` handlers are detached, and the promise resolves `undefined`
+     * (decode is best-effort — abort is not an error here).
+     */
+    readonly signal?: AbortSignal;
 }
 export interface ImageDimensions {
     readonly width: number;

package/dist/adapters/extract-image-dimensions.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-image-dimensions.d.cts","sourceRoot":"","sources":["../../src/adapters/extract-image-dimensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,6BAA6B;IAC7C,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAID,wBAAsB,sBAAsB,CAC3C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAsDtC"}
+{"version":3,"file":"extract-image-dimensions.d.cts","sourceRoot":"","sources":["../../src/adapters/extract-image-dimensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,6BAA6B;IAC7C,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAID,wBAAsB,sBAAsB,CAC3C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAkEtC"}

package/dist/adapters/extract-image-dimensions.d.ts

@@ -12,6 +12,12 @@
 export interface ExtractImageDimensionsOptions {
     /** Abort decode after this many ms. Default 3000. */
     readonly timeoutMs?: number;
+    /**
+     * Cancels the in-flight decode. On abort the timer is cleared, the
+     * `Image` handlers are detached, and the promise resolves `undefined`
+     * (decode is best-effort — abort is not an error here).
+     */
+    readonly signal?: AbortSignal;
 }
 export interface ImageDimensions {
     readonly width: number;

package/dist/adapters/extract-image-dimensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-image-dimensions.d.ts","sourceRoot":"","sources":["../../src/adapters/extract-image-dimensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,6BAA6B;IAC7C,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAID,wBAAsB,sBAAsB,CAC3C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAsDtC"}
+{"version":3,"file":"extract-image-dimensions.d.ts","sourceRoot":"","sources":["../../src/adapters/extract-image-dimensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,6BAA6B;IAC7C,qDAAqD;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAID,wBAAsB,sBAAsB,CAC3C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAkEtC"}

package/dist/adapters/extract-image-dimensions.js

@@ -3,17 +3,26 @@ async function extractImageDimensions(url, mimeType, options = {}) {
     if (!mimeType || !mimeType.startsWith("image/")) return;
     if ("u" < typeof Image) return;
     const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    const signal = options.signal;
+    if (signal?.aborted) return;
     return new Promise((resolve)=>{
         let settled = false;
         const image = new Image();
+        const onAbort = ()=>{
+            settle(void 0);
+        };
         const settle = (value)=>{
             if (settled) return;
             settled = true;
             image.onload = null;
             image.onerror = null;
             if (void 0 !== timer) clearTimeout(timer);
+            signal?.removeEventListener("abort", onAbort);
             resolve(value);
         };
+        signal?.addEventListener("abort", onAbort, {
+            once: true
+        });
         image.onload = ()=>{
             const width = Math.round(image.naturalWidth);
             const height = Math.round(image.naturalHeight);

package/dist/adapters/in-memory.cjs

@@ -28,14 +28,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_extract_image_dimensions_cjs_namespaceObject = require("./extract-image-dimensions.cjs");
 function inMemoryUploader() {
-    const filesById = new Map();
     let counter = 0;
-    return async (file)=>{
+    return async (file, opts)=>{
         counter += 1;
         const id = `asset-${counter}`;
-        filesById.set(id, file);
         const url = "function" == typeof URL.createObjectURL ? URL.createObjectURL(file) : `blob:asset-manager/${id}`;
-        const dimensions = await (0, external_extract_image_dimensions_cjs_namespaceObject.extractImageDimensions)(url, file.type);
+        const dimensions = await (0, external_extract_image_dimensions_cjs_namespaceObject.extractImageDimensions)(url, file.type, {
+            ...opts?.signal ? {
+                signal: opts.signal
+            } : {}
+        });
         const result = {
             id,
             url,

package/dist/adapters/in-memory.d.cts

@@ -1,3 +1,9 @@
-import type { UploadAdapter } from "../types.js";
+import type { UploadAdapter } from "../types/types.js";
+/**
+ * In-memory upload adapter for demos and tests. Returns a `blob:` URL
+ * that the consumer renders directly, so the object URL intentionally
+ * lives for the page lifetime — it cannot be revoked while the asset is
+ * still referenced. Not for production use.
+ */
 export declare function inMemoryUploader(): UploadAdapter;
 //# sourceMappingURL=in-memory.d.cts.map

package/dist/adapters/in-memory.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"in-memory.d.cts","sourceRoot":"","sources":["../../src/adapters/in-memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAG/D,wBAAgB,gBAAgB,IAAI,aAAa,CA8BhD"}
+{"version":3,"file":"in-memory.d.cts","sourceRoot":"","sources":["../../src/adapters/in-memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,mBAAmB,CAAC;AAGrE;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CA8BhD"}

package/dist/adapters/in-memory.d.ts

@@ -1,3 +1,9 @@
-import type { UploadAdapter } from "../types.js";
+import type { UploadAdapter } from "../types/types.js";
+/**
+ * In-memory upload adapter for demos and tests. Returns a `blob:` URL
+ * that the consumer renders directly, so the object URL intentionally
+ * lives for the page lifetime — it cannot be revoked while the asset is
+ * still referenced. Not for production use.
+ */
 export declare function inMemoryUploader(): UploadAdapter;
 //# sourceMappingURL=in-memory.d.ts.map

package/dist/adapters/in-memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in-memory.d.ts","sourceRoot":"","sources":["../../src/adapters/in-memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAG/D,wBAAgB,gBAAgB,IAAI,aAAa,CA8BhD"}
+{"version":3,"file":"in-memory.d.ts","sourceRoot":"","sources":["../../src/adapters/in-memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,mBAAmB,CAAC;AAGrE;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CA8BhD"}

package/dist/adapters/in-memory.js

@@ -1,13 +1,15 @@
 import { extractImageDimensions } from "./extract-image-dimensions.js";
 function inMemoryUploader() {
-    const filesById = new Map();
     let counter = 0;
-    return async (file)=>{
+    return async (file, opts)=>{
         counter += 1;
         const id = `asset-${counter}`;
-        filesById.set(id, file);
         const url = "function" == typeof URL.createObjectURL ? URL.createObjectURL(file) : `blob:asset-manager/${id}`;
-        const dimensions = await extractImageDimensions(url, file.type);
+        const dimensions = await extractImageDimensions(url, file.type, {
+            ...opts?.signal ? {
+                signal: opts.signal
+            } : {}
+        });
         const result = {
             id,
             url,

package/dist/adapters/s3-presigned.cjs

@@ -24,43 +24,48 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    s3PresignedAdapter: ()=>s3PresignedAdapter,
-    RetryableError: ()=>external_retry_cjs_namespaceObject.RetryableError
+    RetryableError: ()=>retry_cjs_namespaceObject.RetryableError,
+    s3PresignedAdapter: ()=>s3PresignedAdapter
 });
-const external_errors_cjs_namespaceObject = require("../errors.cjs");
-const external_retry_cjs_namespaceObject = require("../retry.cjs");
+const errors_cjs_namespaceObject = require("../utils/errors.cjs");
+const retry_cjs_namespaceObject = require("../utils/retry.cjs");
 function s3PresignedAdapter(options) {
     const fetchImpl = options.fetch ?? globalThis.fetch;
     if ("function" != typeof fetchImpl) throw new Error("s3PresignedAdapter: no `fetch` implementation available. Pass `options.fetch`.");
     const generateId = options.idGenerator ?? defaultIdGenerator;
-    return async (file)=>{
-        const presign = await (0, external_retry_cjs_namespaceObject.withRetry)(()=>requestPresign(file, fetchImpl, options), {
-            ...options.retry ?? {},
-            signal: options.signal
-        });
-        await (0, external_retry_cjs_namespaceObject.withRetry)(()=>putToS3(file, presign, fetchImpl, options.signal), {
-            ...options.retry ?? {},
-            signal: options.signal
-        });
-        const id = presign.id ?? generateId();
-        const publicUrl = presign.publicUrl ?? stripQueryAndFragment(presign.url);
-        const result = {
-            id,
-            url: publicUrl,
-            ...file.name ? {
-                name: file.name
-            } : {},
-            meta: {
-                size: file.size,
-                ...file.type ? {
-                    mimeType: file.type
-                } : {}
-            }
-        };
-        return result;
+    return async (file, callOptions)=>{
+        const { signal, dispose } = combineSignals(options.signal, callOptions?.signal);
+        try {
+            const presign = await (0, retry_cjs_namespaceObject.withRetry)(()=>requestPresign(file, fetchImpl, options, signal), {
+                ...options.retry ?? {},
+                signal
+            });
+            await (0, retry_cjs_namespaceObject.withRetry)(()=>putToS3(file, presign, fetchImpl, signal), {
+                ...options.retry ?? {},
+                signal
+            });
+            const id = presign.id ?? generateId();
+            const publicUrl = presign.publicUrl ?? stripQueryAndFragment(presign.url);
+            const result = {
+                id,
+                url: publicUrl,
+                ...file.name ? {
+                    name: file.name
+                } : {},
+                meta: {
+                    size: file.size,
+                    ...file.type ? {
+                        mimeType: file.type
+                    } : {}
+                }
+            };
+            return result;
+        } finally{
+            dispose();
+        }
     };
 }
-async function requestPresign(file, fetchImpl, options) {
+async function requestPresign(file, fetchImpl, options, signal) {
     const url = "string" == typeof options.presignEndpoint ? options.presignEndpoint : options.presignEndpoint.toString();
     const body = JSON.stringify({
         name: file.name,
@@ -76,28 +81,28 @@ async function requestPresign(file, fetchImpl, options) {
                 ...options.headers ?? {}
             },
             body,
-            ...options.signal ? {
-                signal: options.signal
+            ...signal ? {
+                signal
             } : {}
         });
     } catch (cause) {
-        throw new external_retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: presign request failed (${describeError(cause)}).`, {
+        throw new retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: presign request failed (${describeError(cause)}).`, {
             cause
         });
     }
-    if (response.status >= 500) throw new external_retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: presign returned ${response.status}.`, {
+    if (response.status >= 500) throw new retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: presign returned ${response.status}.`, {
         retryAfterMs: parseRetryAfter(response.headers.get("retry-after"))
     });
-    if (!response.ok) throw new external_errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", `s3PresignedAdapter: presign returned ${response.status}.`);
+    if (!response.ok) throw new errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", `s3PresignedAdapter: presign returned ${response.status}.`);
     let payload;
     try {
         payload = await response.json();
     } catch (cause) {
-        throw new external_errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", "s3PresignedAdapter: presign response was not JSON.", {
+        throw new errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", "s3PresignedAdapter: presign response was not JSON.", {
             cause
         });
     }
-    if (!isPresignResponse(payload)) throw new external_errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", "s3PresignedAdapter: presign response missing `url`.");
+    if (!isPresignResponse(payload)) throw new errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", "s3PresignedAdapter: presign response missing `url`.");
     return payload;
 }
 async function putToS3(file, presign, fetchImpl, signal) {
@@ -118,14 +123,14 @@ async function putToS3(file, presign, fetchImpl, signal) {
             } : {}
         });
     } catch (cause) {
-        throw new external_retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: PUT failed (${describeError(cause)}).`, {
+        throw new retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: PUT failed (${describeError(cause)}).`, {
             cause
         });
     }
-    if (response.status >= 500) throw new external_retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: PUT returned ${response.status}.`, {
+    if (response.status >= 500) throw new retry_cjs_namespaceObject.RetryableError(`s3PresignedAdapter: PUT returned ${response.status}.`, {
         retryAfterMs: parseRetryAfter(response.headers.get("retry-after"))
     });
-    if (!response.ok) throw new external_errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", `s3PresignedAdapter: PUT returned ${response.status}.`);
+    if (!response.ok) throw new errors_cjs_namespaceObject.AssetValidationError("UPLOAD_FAILED", `s3PresignedAdapter: PUT returned ${response.status}.`);
 }
 function isPresignResponse(value) {
     return null !== value && "object" == typeof value && "string" == typeof value.url && value.url.length > 0;
@@ -155,6 +160,51 @@ function defaultIdGenerator() {
     if (void 0 !== globalThis.crypto && "function" == typeof globalThis.crypto.randomUUID) return globalThis.crypto.randomUUID();
     return `asset-${Math.random().toString(36).slice(2)}-${Date.now()}`;
 }
+const NOOP_DISPOSE = ()=>void 0;
+function combineSignals(a, b) {
+    if (!a) return {
+        signal: b,
+        dispose: NOOP_DISPOSE
+    };
+    if (!b) return {
+        signal: a,
+        dispose: NOOP_DISPOSE
+    };
+    if (a === b) return {
+        signal: a,
+        dispose: NOOP_DISPOSE
+    };
+    const anyImpl = AbortSignal.any;
+    if ("function" == typeof anyImpl) return {
+        signal: anyImpl([
+            a,
+            b
+        ]),
+        dispose: NOOP_DISPOSE
+    };
+    const controller = new AbortController();
+    const onAbortA = ()=>{
+        if (!controller.signal.aborted) controller.abort(a.reason);
+    };
+    const onAbortB = ()=>{
+        if (!controller.signal.aborted) controller.abort(b.reason);
+    };
+    if (a.aborted) onAbortA();
+    else a.addEventListener("abort", onAbortA, {
+        once: true
+    });
+    if (b.aborted) onAbortB();
+    else b.addEventListener("abort", onAbortB, {
+        once: true
+    });
+    return {
+        signal: controller.signal,
+        dispose: ()=>{
+            a.removeEventListener("abort", onAbortA);
+            b.removeEventListener("abort", onAbortB);
+        }
+    };
+}
 exports.RetryableError = __webpack_exports__.RetryableError;
 exports.s3PresignedAdapter = __webpack_exports__.s3PresignedAdapter;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/adapters/s3-presigned.d.cts

@@ -17,10 +17,11 @@
  *
  * @experimental Public surface may change before v1.0.
  */
-import { type RetryOptions } from "../retry.js";
-import type { UploadAdapter } from "../types.js";
-export { RetryableError } from "../retry.js";
-export type { RetryOptions } from "../retry.js";
+import type { UploadAdapter } from "../types/types.js";
+import { type RetryOptions } from "../utils/retry.js";
+export type { RetryOptions } from "../utils/retry.js";
+/** @deprecated Import from `@anvilkit/plugin-asset-manager/retry` instead. */
+export { RetryableError } from "../utils/retry.js";
 export interface S3PresignedAdapterOptions {
     /** Endpoint that returns a presigned PUT target for the file. */
     readonly presignEndpoint: string | URL;

package/dist/adapters/s3-presigned.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"s3-presigned.d.cts","sourceRoot":"","sources":["../../src/adapters/s3-presigned.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,EAAkB,KAAK,YAAY,EAAa,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,yBAAyB;IACzC,iEAAiE;IACjE,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,GAAG,CAAC;IACvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IACjC,yBAAyB;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,wDAAwD;IACxD,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,yBAAyB,GAChC,aAAa,CAkCf"}
+{"version":3,"file":"s3-presigned.d.cts","sourceRoot":"","sources":["../../src/adapters/s3-presigned.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAEN,KAAK,YAAY,EAEjB,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAMtD,8EAA8E;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,yBAAyB;IACzC,iEAAiE;IACjE,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,GAAG,CAAC;IACvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IACjC,yBAAyB;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,wDAAwD;IACxD,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,yBAAyB,GAChC,aAAa,CA+Cf"}

package/dist/adapters/s3-presigned.d.ts

@@ -17,10 +17,11 @@
  *
  * @experimental Public surface may change before v1.0.
  */
-import { type RetryOptions } from "../retry.js";
-import type { UploadAdapter } from "../types.js";
-export { RetryableError } from "../retry.js";
-export type { RetryOptions } from "../retry.js";
+import type { UploadAdapter } from "../types/types.js";
+import { type RetryOptions } from "../utils/retry.js";
+export type { RetryOptions } from "../utils/retry.js";
+/** @deprecated Import from `@anvilkit/plugin-asset-manager/retry` instead. */
+export { RetryableError } from "../utils/retry.js";
 export interface S3PresignedAdapterOptions {
     /** Endpoint that returns a presigned PUT target for the file. */
     readonly presignEndpoint: string | URL;

package/dist/adapters/s3-presigned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3-presigned.d.ts","sourceRoot":"","sources":["../../src/adapters/s3-presigned.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,EAAkB,KAAK,YAAY,EAAa,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,yBAAyB;IACzC,iEAAiE;IACjE,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,GAAG,CAAC;IACvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IACjC,yBAAyB;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,wDAAwD;IACxD,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,yBAAyB,GAChC,aAAa,CAkCf"}
+{"version":3,"file":"s3-presigned.d.ts","sourceRoot":"","sources":["../../src/adapters/s3-presigned.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAEN,KAAK,YAAY,EAEjB,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAMtD,8EAA8E;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,yBAAyB;IACzC,iEAAiE;IACjE,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,GAAG,CAAC;IACvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IACjC,yBAAyB;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,wDAAwD;IACxD,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,yBAAyB,GAChC,aAAa,CA+Cf"}

package/dist/adapters/s3-presigned.js

@@ -1,37 +1,42 @@
-import { AssetValidationError } from "../errors.js";
-import { RetryableError, withRetry } from "../retry.js";
+import { AssetValidationError } from "../utils/errors.js";
+import { RetryableError, withRetry } from "../utils/retry.js";
 function s3PresignedAdapter(options) {
     const fetchImpl = options.fetch ?? globalThis.fetch;
     if ("function" != typeof fetchImpl) throw new Error("s3PresignedAdapter: no `fetch` implementation available. Pass `options.fetch`.");
     const generateId = options.idGenerator ?? defaultIdGenerator;
-    return async (file)=>{
-        const presign = await withRetry(()=>requestPresign(file, fetchImpl, options), {
-            ...options.retry ?? {},
-            signal: options.signal
-        });
-        await withRetry(()=>putToS3(file, presign, fetchImpl, options.signal), {
-            ...options.retry ?? {},
-            signal: options.signal
-        });
-        const id = presign.id ?? generateId();
-        const publicUrl = presign.publicUrl ?? stripQueryAndFragment(presign.url);
-        const result = {
-            id,
-            url: publicUrl,
-            ...file.name ? {
-                name: file.name
-            } : {},
-            meta: {
-                size: file.size,
-                ...file.type ? {
-                    mimeType: file.type
-                } : {}
-            }
-        };
-        return result;
+    return async (file, callOptions)=>{
+        const { signal, dispose } = combineSignals(options.signal, callOptions?.signal);
+        try {
+            const presign = await withRetry(()=>requestPresign(file, fetchImpl, options, signal), {
+                ...options.retry ?? {},
+                signal
+            });
+            await withRetry(()=>putToS3(file, presign, fetchImpl, signal), {
+                ...options.retry ?? {},
+                signal
+            });
+            const id = presign.id ?? generateId();
+            const publicUrl = presign.publicUrl ?? stripQueryAndFragment(presign.url);
+            const result = {
+                id,
+                url: publicUrl,
+                ...file.name ? {
+                    name: file.name
+                } : {},
+                meta: {
+                    size: file.size,
+                    ...file.type ? {
+                        mimeType: file.type
+                    } : {}
+                }
+            };
+            return result;
+        } finally{
+            dispose();
+        }
     };
 }
-async function requestPresign(file, fetchImpl, options) {
+async function requestPresign(file, fetchImpl, options, signal) {
     const url = "string" == typeof options.presignEndpoint ? options.presignEndpoint : options.presignEndpoint.toString();
     const body = JSON.stringify({
         name: file.name,
@@ -47,8 +52,8 @@ async function requestPresign(file, fetchImpl, options) {
                 ...options.headers ?? {}
             },
             body,
-            ...options.signal ? {
-                signal: options.signal
+            ...signal ? {
+                signal
             } : {}
         });
     } catch (cause) {
@@ -126,4 +131,49 @@ function defaultIdGenerator() {
     if (void 0 !== globalThis.crypto && "function" == typeof globalThis.crypto.randomUUID) return globalThis.crypto.randomUUID();
     return `asset-${Math.random().toString(36).slice(2)}-${Date.now()}`;
 }
+const NOOP_DISPOSE = ()=>void 0;
+function combineSignals(a, b) {
+    if (!a) return {
+        signal: b,
+        dispose: NOOP_DISPOSE
+    };
+    if (!b) return {
+        signal: a,
+        dispose: NOOP_DISPOSE
+    };
+    if (a === b) return {
+        signal: a,
+        dispose: NOOP_DISPOSE
+    };
+    const anyImpl = AbortSignal.any;
+    if ("function" == typeof anyImpl) return {
+        signal: anyImpl([
+            a,
+            b
+        ]),
+        dispose: NOOP_DISPOSE
+    };
+    const controller = new AbortController();
+    const onAbortA = ()=>{
+        if (!controller.signal.aborted) controller.abort(a.reason);
+    };
+    const onAbortB = ()=>{
+        if (!controller.signal.aborted) controller.abort(b.reason);
+    };
+    if (a.aborted) onAbortA();
+    else a.addEventListener("abort", onAbortA, {
+        once: true
+    });
+    if (b.aborted) onAbortB();
+    else b.addEventListener("abort", onAbortB, {
+        once: true
+    });
+    return {
+        signal: controller.signal,
+        dispose: ()=>{
+            a.removeEventListener("abort", onAbortA);
+            b.removeEventListener("abort", onAbortB);
+        }
+    };
+}
 export { RetryableError, s3PresignedAdapter };

package/dist/index.cjs

@@ -24,33 +24,33 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    AssetResolutionError: ()=>external_errors_cjs_namespaceObject.AssetResolutionError,
-    getRequiredCsp: ()=>external_csp_cjs_namespaceObject.getRequiredCsp,
-    inferAssetKind: ()=>external_infer_kind_cjs_namespaceObject.inferAssetKind,
-    createIRAssetResolver: ()=>external_resolver_cjs_namespaceObject.createIRAssetResolver,
-    resolveAssets: ()=>external_resolver_cjs_namespaceObject.resolveAssets,
+    AssetResolutionError: ()=>errors_cjs_namespaceObject.AssetResolutionError,
+    AssetValidationError: ()=>errors_cjs_namespaceObject.AssetValidationError,
     createAssetManagerPlugin: ()=>external_plugin_cjs_namespaceObject.createAssetManagerPlugin,
-    AssetValidationError: ()=>external_errors_cjs_namespaceObject.AssetValidationError,
-    createAssetRegistry: ()=>external_registry_cjs_namespaceObject.createAssetRegistry,
-    uploadAsset: ()=>external_plugin_cjs_namespaceObject.uploadAsset,
-    validateUploadResult: ()=>external_validate_upload_result_cjs_namespaceObject.validateUploadResult,
-    getAssetRegistry: ()=>external_plugin_cjs_namespaceObject.getAssetRegistry,
-    createStudioAssetSource: ()=>external_studio_asset_source_cjs_namespaceObject.createStudioAssetSource,
-    inferStudioAssetKind: ()=>external_studio_asset_source_cjs_namespaceObject.inferStudioAssetKind,
+    createAssetReference: ()=>external_plugin_cjs_namespaceObject.createAssetReference,
+    createAssetRegistry: ()=>registry_cjs_namespaceObject.createAssetRegistry,
+    createIRAssetResolver: ()=>resolver_cjs_namespaceObject.createIRAssetResolver,
+    createStudioAssetSource: ()=>studio_asset_source_cjs_namespaceObject.createStudioAssetSource,
     dataUrlUploader: ()=>data_url_cjs_namespaceObject.dataUrlUploader,
+    getAssetRegistry: ()=>external_plugin_cjs_namespaceObject.getAssetRegistry,
+    getRequiredCsp: ()=>csp_cjs_namespaceObject.getRequiredCsp,
     inMemoryUploader: ()=>in_memory_cjs_namespaceObject.inMemoryUploader,
-    createAssetReference: ()=>external_plugin_cjs_namespaceObject.createAssetReference
+    inferAssetKind: ()=>infer_kind_cjs_namespaceObject.inferAssetKind,
+    inferStudioAssetKind: ()=>studio_asset_source_cjs_namespaceObject.inferStudioAssetKind,
+    resolveAssets: ()=>resolver_cjs_namespaceObject.resolveAssets,
+    uploadAsset: ()=>external_plugin_cjs_namespaceObject.uploadAsset,
+    validateUploadResult: ()=>validate_upload_result_cjs_namespaceObject.validateUploadResult
 });
 const data_url_cjs_namespaceObject = require("./adapters/data-url.cjs");
 const in_memory_cjs_namespaceObject = require("./adapters/in-memory.cjs");
-const external_csp_cjs_namespaceObject = require("./csp.cjs");
-const external_errors_cjs_namespaceObject = require("./errors.cjs");
-const external_infer_kind_cjs_namespaceObject = require("./infer-kind.cjs");
 const external_plugin_cjs_namespaceObject = require("./plugin.cjs");
-const external_registry_cjs_namespaceObject = require("./registry.cjs");
-const external_resolver_cjs_namespaceObject = require("./resolver.cjs");
-const external_studio_asset_source_cjs_namespaceObject = require("./studio-asset-source.cjs");
-const external_validate_upload_result_cjs_namespaceObject = require("./validate-upload-result.cjs");
+const csp_cjs_namespaceObject = require("./utils/csp.cjs");
+const errors_cjs_namespaceObject = require("./utils/errors.cjs");
+const infer_kind_cjs_namespaceObject = require("./utils/infer-kind.cjs");
+const registry_cjs_namespaceObject = require("./utils/registry.cjs");
+const resolver_cjs_namespaceObject = require("./utils/resolver.cjs");
+const studio_asset_source_cjs_namespaceObject = require("./utils/studio-asset-source.cjs");
+const validate_upload_result_cjs_namespaceObject = require("./utils/validate-upload-result.cjs");
 exports.AssetResolutionError = __webpack_exports__.AssetResolutionError;
 exports.AssetValidationError = __webpack_exports__.AssetValidationError;
 exports.createAssetManagerPlugin = __webpack_exports__.createAssetManagerPlugin;

package/dist/index.d.cts

@@ -1,18 +1,18 @@
 export type { DataUrlUploaderOptions } from "./adapters/data-url.js";
 export { dataUrlUploader } from "./adapters/data-url.js";
 export { inMemoryUploader } from "./adapters/in-memory.js";
-export type { RequiredCsp, RequiredCspOptions, S3CspOptions, } from "./csp.js";
-export { getRequiredCsp } from "./csp.js";
-export type { AssetResolutionErrorCode } from "./errors.js";
-export { AssetResolutionError, AssetValidationError, } from "./errors.js";
-export { inferAssetKind } from "./infer-kind.js";
 export { createAssetManagerPlugin, createAssetReference, getAssetRegistry, uploadAsset, } from "./plugin.js";
-export { createAssetRegistry } from "./registry.js";
-export type { CreateIRAssetResolverOptions } from "./resolver.js";
-export { createIRAssetResolver, resolveAssets } from "./resolver.js";
-export type { CreateStudioAssetSourceOptions } from "./studio-asset-source.js";
-export { createStudioAssetSource, inferStudioAssetKind, } from "./studio-asset-source.js";
-export type { AssetKind, AssetManagerOptions, AssetMeta, AssetRegistry, AssetRegistryListener, AssetSearchOptions, AssetSearchPage, UploadAdapter, UploadResult, } from "./types.js";
-export type { ValidateUploadResultOptions } from "./validate-upload-result.js";
-export { validateUploadResult } from "./validate-upload-result.js";
+export type { AssetKind, AssetManagerOptions, AssetMeta, AssetRegistry, AssetRegistryListener, AssetSearchOptions, AssetSearchPage, UploadAdapter, UploadAdapterOptions, UploadResult, } from "./types/types.js";
+export type { RequiredCsp, RequiredCspOptions, S3CspOptions, } from "./utils/csp.js";
+export { getRequiredCsp } from "./utils/csp.js";
+export type { AssetResolutionErrorCode } from "./utils/errors.js";
+export { AssetResolutionError, AssetValidationError } from "./utils/errors.js";
+export { inferAssetKind } from "./utils/infer-kind.js";
+export { createAssetRegistry } from "./utils/registry.js";
+export type { CreateIRAssetResolverOptions } from "./utils/resolver.js";
+export { createIRAssetResolver, resolveAssets } from "./utils/resolver.js";
+export type { CreateStudioAssetSourceOptions } from "./utils/studio-asset-source.js";
+export { createStudioAssetSource, inferStudioAssetKind, } from "./utils/studio-asset-source.js";
+export type { ValidateUploadResultOptions } from "./utils/validate-upload-result.js";
+export { validateUploadResult } from "./utils/validate-upload-result.js";
 //# sourceMappingURL=index.d.cts.map