@org-quicko/silo-client 1.0.1 → 1.1.0

package/README.md

@@ -208,6 +208,7 @@ value you store. Storing the URL instead is what a later rename breaks.
 await poster.rename("arrival-2016.jpg")
 await poster.moveTo("posters/2016")
 await poster.setTags(["poster"])        // replaces the whole list
+await poster.replace(file)              // new bytes, same id, name and URL
 await poster.delete()                   // refused while an entry refers to it
 await poster.delete({ force: true })
 
@@ -217,6 +218,12 @@ usage.total                             // the true count
 usage.visible                           // how many of them this key may see
 ```
 
+`replace` swaps the file behind an asset. The id, the reference, the name and
+the URL all stay, so every entry that refers to it shows the new file and none
+of them is rewritten. The new file must keep the same extension. It needs the
+`media:replace` claim, and `entries:update` on each scope that refers to the
+asset.
+
 Folders, and a bulk delete that takes up to 100 ids:
 
 ```ts

package/dist/errors/network-error.d.cts

@@ -8,4 +8,9 @@ export declare class NetworkError extends Error {
     readonly method: string;
     readonly path: string;
     constructor(method: string, path: string, cause: unknown);
+    /** What `fetch` rejected with, in the message itself: a `cause` chain is
+     * printed by some consoles and by no log line, and "never reached the
+     * server" alone reads as a verdict on the network when the fault can be the
+     * call. */
+    private static reason;
 }

package/dist/errors/network-error.d.ts

@@ -8,4 +8,9 @@ export declare class NetworkError extends Error {
     readonly method: string;
     readonly path: string;
     constructor(method: string, path: string, cause: unknown);
+    /** What `fetch` rejected with, in the message itself: a `cause` chain is
+     * printed by some consoles and by no log line, and "never reached the
+     * server" alone reads as a verdict on the network when the fault can be the
+     * call. */
+    private static reason;
 }

package/dist/index.cjs

@@ -181,6 +181,9 @@ class ApiPath {
   static mediaAssetUsages(id) {
     return `${ApiPath.mediaAsset(id)}/usages`;
   }
+  static mediaAssetContent(id) {
+    return `${ApiPath.mediaAsset(id)}/content`;
+  }
   static mediaBulkDelete() {
     return "/api/media/delete";
   }
@@ -227,6 +230,22 @@ class MediaAssetMapper {
   }
 }
 
+// src/media/media-file.ts
+class MediaFile {
+  static toBlob(bytes, contentType) {
+    if (bytes instanceof Blob)
+      return bytes;
+    return new Blob([bytes], contentType ? { type: contentType } : undefined);
+  }
+  static nameOf(input, explicit) {
+    if (explicit)
+      return explicit;
+    if (input instanceof File && input.name)
+      return input.name;
+    throw new Error("media: a Blob has no filename — pass { filename } explicitly");
+  }
+}
+
 // src/media/media-reference.ts
 class MediaReference {
   static Scheme = "silo://media/";
@@ -388,6 +407,22 @@ class MediaAsset {
   async setTags(tags, options) {
     return this.patch({ tags: [...tags] }, options);
   }
+  async replace(input, options) {
+    const form = new FormData;
+    if (input instanceof Blob) {
+      form.set("file", input, MediaFile.nameOf(input, options?.filename));
+    } else {
+      form.set("file", MediaFile.toBlob(input.bytes, input.contentType), input.filename);
+    }
+    const payload = await this.transport.upload({
+      method: "POST",
+      path: ApiPath.mediaAssetContent(this.id),
+      signal: options?.signal,
+      timeoutMilliseconds: options?.timeoutMilliseconds
+    }, form);
+    this.record = MediaAssetMapper.toRecord(payload);
+    return this;
+  }
   async delete(options) {
     await this.transport.empty({
       method: "DELETE",
@@ -621,11 +656,11 @@ class Media {
     let options;
     if (input instanceof Blob) {
       const fileOptions = second ?? {};
-      form.set("file", input, Media.filenameOf(input, fileOptions.filename));
+      form.set("file", input, MediaFile.nameOf(input, fileOptions.filename));
       folder = fileOptions.folder;
       options = third ?? fileOptions;
     } else {
-      form.set("file", Media.toBlob(input.bytes, input.contentType), input.filename);
+      form.set("file", MediaFile.toBlob(input.bytes, input.contentType), input.filename);
       folder = input.folder;
       options = second;
     }
@@ -693,18 +728,6 @@ class Media {
       sort: query.sort
     };
   }
-  static toBlob(bytes, contentType) {
-    if (bytes instanceof Blob)
-      return bytes;
-    return new Blob([bytes], contentType ? { type: contentType } : undefined);
-  }
-  static filenameOf(input, explicit) {
-    if (explicit)
-      return explicit;
-    if (input instanceof File && input.name)
-      return input.name;
-    throw new Error("media upload: a Blob has no filename — pass { filename } explicitly");
-  }
 }
 
 // src/variables/variable.ts
@@ -1568,12 +1591,19 @@ class NetworkError extends Error {
   method;
   path;
   constructor(method, path, cause) {
-    super(`network error on ${method} ${path}: the request never reached the server`, { cause });
+    super(`network error on ${method} ${path}: the request never reached the server${NetworkError.reason(cause)}`, { cause });
     this.name = "NetworkError";
     this.method = method;
     this.path = path;
     Object.setPrototypeOf(this, NetworkError.prototype);
   }
+  static reason(cause) {
+    if (cause instanceof Error && cause.message)
+      return ` (${cause.message})`;
+    if (typeof cause === "string" && cause)
+      return ` (${cause})`;
+    return "";
+  }
 }
 
 // src/errors/timeout-error.ts
@@ -1687,7 +1717,7 @@ class Transport {
     this.key = options.key;
     this.headers = options.headers ?? {};
     this.timeoutMilliseconds = options.timeoutMilliseconds;
-    this.fetchFunction = options.fetch ?? fetch;
+    this.fetchFunction = Transport.resolveFetch(options.fetch);
   }
   async json(request) {
     const response = await this.execute(request);
@@ -1723,9 +1753,10 @@ class Transport {
   async execute(request, form) {
     const abortSignals = new AbortSignals(request.signal, request.timeoutMilliseconds ?? this.timeoutMilliseconds);
     const url = `${this.url}${request.path}${QueryString.build(request.query)}`;
+    const sendRequest = this.fetchFunction;
     let response;
     try {
-      response = await this.fetchFunction(url, {
+      response = await sendRequest(url, {
         method: request.method,
         headers: this.buildHeaders(request, Boolean(form)),
         body: form ?? (request.body === undefined ? undefined : JSON.stringify(request.body)),
@@ -1763,6 +1794,14 @@ class Transport {
   static normalizeUrl(url) {
     return url.replace(/\/+$/, "");
   }
+  static resolveFetch(fetchFunction) {
+    if (fetchFunction)
+      return fetchFunction;
+    if (typeof globalThis.fetch !== "function") {
+      throw new Error("this runtime has no global fetch: pass one as SiloOptions.fetch");
+    }
+    return globalThis.fetch.bind(globalThis);
+  }
 }
 
 // src/silo.ts
@@ -1847,6 +1886,7 @@ class RouteInventory {
     "PATCH /api/media/:id",
     "DELETE /api/media/:id",
     "GET /api/media/:id/usages",
+    "POST /api/media/:id/content",
     "POST /api/media/delete",
     "GET /api/media/folders",
     "POST /api/media/folders",
@@ -1857,6 +1897,7 @@ class RouteInventory {
     "GET /api/session": "key introspection, an operator surface",
     "GET /api/keys": "keys and claims are an operator surface",
     "POST /api/keys": "keys and claims are an operator surface",
+    "PATCH /api/keys/:id": "keys and claims are an operator surface",
     "DELETE /api/keys/:id": "keys and claims are an operator surface",
     "GET /api/audit": "an operator surface",
     "GET /api/observability": "an operator surface",

package/dist/index.d.cts

@@ -71,6 +71,7 @@ export type { MediaAssetRecord } from "./media/media-asset.cjs";
 export type { MediaQuery } from "./media/media-query.cjs";
 export type { MediaUsage } from "./media/media-usage.cjs";
 export type { MediaUsageQuery } from "./media/media-usage-page.cjs";
+export type { MediaReplace, MediaReplaceBytes, MediaReplaceOptions } from "./media/media-replace.cjs";
 export type { MediaUpload, MediaUploadBytes, MediaUploadFileOptions } from "./media/media-upload.cjs";
 export type { MediaDeleteFailure } from "./media/media-delete-failure.cjs";
 export type { MediaDeleteOptions } from "./media/media-delete-options.cjs";

package/dist/index.d.ts

@@ -71,6 +71,7 @@ export type { MediaAssetRecord } from "./media/media-asset.js";
 export type { MediaQuery } from "./media/media-query.js";
 export type { MediaUsage } from "./media/media-usage.js";
 export type { MediaUsageQuery } from "./media/media-usage-page.js";
+export type { MediaReplace, MediaReplaceBytes, MediaReplaceOptions } from "./media/media-replace.js";
 export type { MediaUpload, MediaUploadBytes, MediaUploadFileOptions } from "./media/media-upload.js";
 export type { MediaDeleteFailure } from "./media/media-delete-failure.js";
 export type { MediaDeleteOptions } from "./media/media-delete-options.js";

package/dist/index.js

@@ -84,6 +84,9 @@ class ApiPath {
   static mediaAssetUsages(id) {
     return `${ApiPath.mediaAsset(id)}/usages`;
   }
+  static mediaAssetContent(id) {
+    return `${ApiPath.mediaAsset(id)}/content`;
+  }
   static mediaBulkDelete() {
     return "/api/media/delete";
   }
@@ -130,6 +133,22 @@ class MediaAssetMapper {
   }
 }
 
+// src/media/media-file.ts
+class MediaFile {
+  static toBlob(bytes, contentType) {
+    if (bytes instanceof Blob)
+      return bytes;
+    return new Blob([bytes], contentType ? { type: contentType } : undefined);
+  }
+  static nameOf(input, explicit) {
+    if (explicit)
+      return explicit;
+    if (input instanceof File && input.name)
+      return input.name;
+    throw new Error("media: a Blob has no filename — pass { filename } explicitly");
+  }
+}
+
 // src/media/media-reference.ts
 class MediaReference {
   static Scheme = "silo://media/";
@@ -291,6 +310,22 @@ class MediaAsset {
   async setTags(tags, options) {
     return this.patch({ tags: [...tags] }, options);
   }
+  async replace(input, options) {
+    const form = new FormData;
+    if (input instanceof Blob) {
+      form.set("file", input, MediaFile.nameOf(input, options?.filename));
+    } else {
+      form.set("file", MediaFile.toBlob(input.bytes, input.contentType), input.filename);
+    }
+    const payload = await this.transport.upload({
+      method: "POST",
+      path: ApiPath.mediaAssetContent(this.id),
+      signal: options?.signal,
+      timeoutMilliseconds: options?.timeoutMilliseconds
+    }, form);
+    this.record = MediaAssetMapper.toRecord(payload);
+    return this;
+  }
   async delete(options) {
     await this.transport.empty({
       method: "DELETE",
@@ -524,11 +559,11 @@ class Media {
     let options;
     if (input instanceof Blob) {
       const fileOptions = second ?? {};
-      form.set("file", input, Media.filenameOf(input, fileOptions.filename));
+      form.set("file", input, MediaFile.nameOf(input, fileOptions.filename));
       folder = fileOptions.folder;
       options = third ?? fileOptions;
     } else {
-      form.set("file", Media.toBlob(input.bytes, input.contentType), input.filename);
+      form.set("file", MediaFile.toBlob(input.bytes, input.contentType), input.filename);
       folder = input.folder;
       options = second;
     }
@@ -596,18 +631,6 @@ class Media {
       sort: query.sort
     };
   }
-  static toBlob(bytes, contentType) {
-    if (bytes instanceof Blob)
-      return bytes;
-    return new Blob([bytes], contentType ? { type: contentType } : undefined);
-  }
-  static filenameOf(input, explicit) {
-    if (explicit)
-      return explicit;
-    if (input instanceof File && input.name)
-      return input.name;
-    throw new Error("media upload: a Blob has no filename — pass { filename } explicitly");
-  }
 }
 
 // src/variables/variable.ts
@@ -1471,12 +1494,19 @@ class NetworkError extends Error {
   method;
   path;
   constructor(method, path, cause) {
-    super(`network error on ${method} ${path}: the request never reached the server`, { cause });
+    super(`network error on ${method} ${path}: the request never reached the server${NetworkError.reason(cause)}`, { cause });
     this.name = "NetworkError";
     this.method = method;
     this.path = path;
     Object.setPrototypeOf(this, NetworkError.prototype);
   }
+  static reason(cause) {
+    if (cause instanceof Error && cause.message)
+      return ` (${cause.message})`;
+    if (typeof cause === "string" && cause)
+      return ` (${cause})`;
+    return "";
+  }
 }
 
 // src/errors/timeout-error.ts
@@ -1590,7 +1620,7 @@ class Transport {
     this.key = options.key;
     this.headers = options.headers ?? {};
     this.timeoutMilliseconds = options.timeoutMilliseconds;
-    this.fetchFunction = options.fetch ?? fetch;
+    this.fetchFunction = Transport.resolveFetch(options.fetch);
   }
   async json(request) {
     const response = await this.execute(request);
@@ -1626,9 +1656,10 @@ class Transport {
   async execute(request, form) {
     const abortSignals = new AbortSignals(request.signal, request.timeoutMilliseconds ?? this.timeoutMilliseconds);
     const url = `${this.url}${request.path}${QueryString.build(request.query)}`;
+    const sendRequest = this.fetchFunction;
     let response;
     try {
-      response = await this.fetchFunction(url, {
+      response = await sendRequest(url, {
         method: request.method,
         headers: this.buildHeaders(request, Boolean(form)),
         body: form ?? (request.body === undefined ? undefined : JSON.stringify(request.body)),
@@ -1666,6 +1697,14 @@ class Transport {
   static normalizeUrl(url) {
     return url.replace(/\/+$/, "");
   }
+  static resolveFetch(fetchFunction) {
+    if (fetchFunction)
+      return fetchFunction;
+    if (typeof globalThis.fetch !== "function") {
+      throw new Error("this runtime has no global fetch: pass one as SiloOptions.fetch");
+    }
+    return globalThis.fetch.bind(globalThis);
+  }
 }
 
 // src/silo.ts
@@ -1750,6 +1789,7 @@ class RouteInventory {
     "PATCH /api/media/:id",
     "DELETE /api/media/:id",
     "GET /api/media/:id/usages",
+    "POST /api/media/:id/content",
     "POST /api/media/delete",
     "GET /api/media/folders",
     "POST /api/media/folders",
@@ -1760,6 +1800,7 @@ class RouteInventory {
     "GET /api/session": "key introspection, an operator surface",
     "GET /api/keys": "keys and claims are an operator surface",
     "POST /api/keys": "keys and claims are an operator surface",
+    "PATCH /api/keys/:id": "keys and claims are an operator surface",
     "DELETE /api/keys/:id": "keys and claims are an operator surface",
     "GET /api/audit": "an operator surface",
     "GET /api/observability": "an operator surface",

package/dist/media/media-asset.d.cts

@@ -1,6 +1,7 @@
 import type { RequestOptions } from "../request-options.cjs";
 import type { Transport } from "../transport/transport.cjs";
 import type { MediaDeleteOptions } from "./media-delete-options.cjs";
+import type { MediaReplace, MediaReplaceOptions } from "./media-replace.cjs";
 import type { MediaUsageQuery } from "./media-usage-page.cjs";
 import { MediaUsagePage } from "./media-usage-page.cjs";
 /** `MediaAsset`'s mapped state — `MediaAssetMapper.toRecord`'s output. */
@@ -53,6 +54,22 @@ export declare class MediaAsset {
     moveTo(folder: string, options?: RequestOptions): Promise<this>;
     /** REPLACES the tag list — `PATCH` replaces, it does not append. */
     setTags(tags: readonly string[], options?: RequestOptions): Promise<this>;
+    /**
+     * Swaps the bytes behind this asset (D67). `id`, `reference`, `url`,
+     * `filename` and `folder` all survive; `hash`, `sizeInBytes` and
+     * `contentType` are re-read from the server's answer.
+     *
+     * Every entry referencing it now resolves to the new file, without any of
+     * them being rewritten — which is the point, and the reason the server asks
+     * for `media:replace` **and** `entries:update` at every scope that refers
+     * to it.
+     *
+     * The new file must keep the current extension: the blob key's suffix is
+     * derived from the filename at upload and is the visible tail of the URL on
+     * a bucket-backed instance, so a `.png` asset takes a `.png` replacement.
+     * Converting a file is a new upload, not a replacement of this one.
+     */
+    replace(input: MediaReplace, options?: MediaReplaceOptions): Promise<this>;
     /** Refused while an entry references it; `{ force: true }` also needs
      * `entries:update` on every scope this asset reaches. */
     delete(options?: MediaDeleteOptions): Promise<void>;

package/dist/media/media-asset.d.ts

@@ -1,6 +1,7 @@
 import type { RequestOptions } from "../request-options.js";
 import type { Transport } from "../transport/transport.js";
 import type { MediaDeleteOptions } from "./media-delete-options.js";
+import type { MediaReplace, MediaReplaceOptions } from "./media-replace.js";
 import type { MediaUsageQuery } from "./media-usage-page.js";
 import { MediaUsagePage } from "./media-usage-page.js";
 /** `MediaAsset`'s mapped state — `MediaAssetMapper.toRecord`'s output. */
@@ -53,6 +54,22 @@ export declare class MediaAsset {
     moveTo(folder: string, options?: RequestOptions): Promise<this>;
     /** REPLACES the tag list — `PATCH` replaces, it does not append. */
     setTags(tags: readonly string[], options?: RequestOptions): Promise<this>;
+    /**
+     * Swaps the bytes behind this asset (D67). `id`, `reference`, `url`,
+     * `filename` and `folder` all survive; `hash`, `sizeInBytes` and
+     * `contentType` are re-read from the server's answer.
+     *
+     * Every entry referencing it now resolves to the new file, without any of
+     * them being rewritten — which is the point, and the reason the server asks
+     * for `media:replace` **and** `entries:update` at every scope that refers
+     * to it.
+     *
+     * The new file must keep the current extension: the blob key's suffix is
+     * derived from the filename at upload and is the visible tail of the URL on
+     * a bucket-backed instance, so a `.png` asset takes a `.png` replacement.
+     * Converting a file is a new upload, not a replacement of this one.
+     */
+    replace(input: MediaReplace, options?: MediaReplaceOptions): Promise<this>;
     /** Refused while an entry references it; `{ force: true }` also needs
      * `entries:update` on every scope this asset reaches. */
     delete(options?: MediaDeleteOptions): Promise<void>;

package/dist/media/media-file.d.cts

@@ -0,0 +1,16 @@
+/**
+ * Turning what a caller passed into the two things a multipart part needs: a
+ * `Blob` and a filename.
+ *
+ * Shared by `Media.upload` and `MediaAsset.replace` (D67) rather than copied
+ * into the second. The filename is not cosmetic on either path — the server
+ * reads the extension off it to decide what the library accepts, and on a
+ * replace to decide whether the file's type is changing at all — so the two
+ * entry points must derive it the same way.
+ */
+export declare class MediaFile {
+    static toBlob(bytes: Uint8Array | ArrayBuffer | Blob, contentType?: string): Blob;
+    /** A `File` carries its own name; a bare `Blob` does not, and sending it
+     * as "blob" is worse than refusing outright. */
+    static nameOf(input: Blob, explicit?: string): string;
+}

package/dist/media/media-file.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Turning what a caller passed into the two things a multipart part needs: a
+ * `Blob` and a filename.
+ *
+ * Shared by `Media.upload` and `MediaAsset.replace` (D67) rather than copied
+ * into the second. The filename is not cosmetic on either path — the server
+ * reads the extension off it to decide what the library accepts, and on a
+ * replace to decide whether the file's type is changing at all — so the two
+ * entry points must derive it the same way.
+ */
+export declare class MediaFile {
+    static toBlob(bytes: Uint8Array | ArrayBuffer | Blob, contentType?: string): Blob;
+    /** A `File` carries its own name; a bare `Blob` does not, and sending it
+     * as "blob" is worse than refusing outright. */
+    static nameOf(input: Blob, explicit?: string): string;
+}

package/dist/media/media-replace.d.cts

@@ -0,0 +1,17 @@
+import type { RequestOptions } from "../request-options.cjs";
+/** The fully-described replacement: raw bytes plus the name whose extension
+ *  the server checks against the one the asset already has. No `folder` — a
+ *  replace changes bytes and nothing else about where the asset sits. */
+export interface MediaReplaceBytes {
+    bytes: Uint8Array | ArrayBuffer | Blob;
+    filename: string;
+    contentType?: string;
+}
+/** The filename to read when the input carries none — a `File` has `.name`,
+ *  a bare `Blob` does not, and the extension is what the server checks. */
+export interface MediaReplaceOptions extends RequestOptions {
+    filename?: string;
+}
+/** `MediaAsset.replace()`'s input: a fully-described replacement, or a
+ *  runtime `File`/`Blob`. */
+export type MediaReplace = MediaReplaceBytes | File | Blob;

package/dist/media/media-replace.d.ts

@@ -0,0 +1,17 @@
+import type { RequestOptions } from "../request-options.js";
+/** The fully-described replacement: raw bytes plus the name whose extension
+ *  the server checks against the one the asset already has. No `folder` — a
+ *  replace changes bytes and nothing else about where the asset sits. */
+export interface MediaReplaceBytes {
+    bytes: Uint8Array | ArrayBuffer | Blob;
+    filename: string;
+    contentType?: string;
+}
+/** The filename to read when the input carries none — a `File` has `.name`,
+ *  a bare `Blob` does not, and the extension is what the server checks. */
+export interface MediaReplaceOptions extends RequestOptions {
+    filename?: string;
+}
+/** `MediaAsset.replace()`'s input: a fully-described replacement, or a
+ *  runtime `File`/`Blob`. */
+export type MediaReplace = MediaReplaceBytes | File | Blob;

package/dist/media/media.d.cts

@@ -30,8 +30,4 @@ export declare class Media {
      * per-id outcomes live in the report, not in a thrown error. */
     deleteMany(ids: readonly string[], options?: MediaDeleteOptions): Promise<MediaDeleteReport>;
     private static toWireQuery;
-    private static toBlob;
-    /** A `File` carries its own name; a bare `Blob` does not, and uploading it
-     * as "blob" is worse than refusing outright. */
-    private static filenameOf;
 }

package/dist/media/media.d.ts

@@ -30,8 +30,4 @@ export declare class Media {
      * per-id outcomes live in the report, not in a thrown error. */
     deleteMany(ids: readonly string[], options?: MediaDeleteOptions): Promise<MediaDeleteReport>;
     private static toWireQuery;
-    private static toBlob;
-    /** A `File` carries its own name; a bare `Blob` does not, and uploading it
-     * as "blob" is worse than refusing outright. */
-    private static filenameOf;
 }

package/dist/transport/api-path.d.cts

@@ -31,6 +31,7 @@ export declare class ApiPath {
     static mediaExtensions(): string;
     static mediaAsset(id: string): string;
     static mediaAssetUsages(id: string): string;
+    static mediaAssetContent(id: string): string;
     static mediaBulkDelete(): string;
     static mediaFolders(): string;
 }

package/dist/transport/api-path.d.ts

@@ -31,6 +31,7 @@ export declare class ApiPath {
     static mediaExtensions(): string;
     static mediaAsset(id: string): string;
     static mediaAssetUsages(id: string): string;
+    static mediaAssetContent(id: string): string;
     static mediaBulkDelete(): string;
     static mediaFolders(): string;
 }

package/dist/transport/transport.d.cts

@@ -42,4 +42,8 @@ export declare class Transport {
     private transportFailure;
     private buildHeaders;
     private static normalizeUrl;
+    /** The caller's own `fetch`, or the runtime's bound to the global. A
+     * browser's `fetch` is a `Window` method and refuses every other receiver,
+     * so the default is stored already bound rather than bare. */
+    private static resolveFetch;
 }

package/dist/transport/transport.d.ts

@@ -42,4 +42,8 @@ export declare class Transport {
     private transportFailure;
     private buildHeaders;
     private static normalizeUrl;
+    /** The caller's own `fetch`, or the runtime's bound to the global. A
+     * browser's `fetch` is a `Window` method and refuses every other receiver,
+     * so the default is stored already bound rather than bare. */
+    private static resolveFetch;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@org-quicko/silo-client",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A typed, object-oriented client for silo's HTTP API",
   "keywords": [
     "silo",