@liveblocks/core 3.24.0 → 3.24.2

package/dist/index.d.cts

@@ -1253,6 +1253,24 @@ type LiveNode = LiveStructure | LiveRegister<Json>;
  * value or a Live storage data structure (LiveMap, LiveList, etc.)
  */
 type LsonObject = Record<string, Lson | undefined>;
+/**
+ * The Json object an Lson object serializes to: every value converted with
+ * `ToJson`, optional keys staying optional.
+ */
+type JsonObjectOf<O extends LsonObject> = {
+    readonly [K in keyof O]: ToJson<Exclude<O[K], undefined>> | (undefined extends O[K] ? undefined : never);
+};
+/**
+ * The Json value a plain Lson object serializes to: an opaque record collapses
+ * to ReadonlyJsonObject, anything else is mapped key by key.
+ *
+ * Inferring V keeps this conditional resolvable, which ToJson's variance
+ * depends on. Deferring it makes unrelated assignments fail, such as
+ * LiveList<never> to Lson.
+ */
+type JsonOfLsonObject<L extends LsonObject> = string extends keyof L ? L extends Record<string, infer V> ? Record<string, V> extends L ? [
+    Json
+] extends [V] ? ReadonlyJsonObject : JsonObjectOf<L> : JsonObjectOf<L> : JsonObjectOf<L> : JsonObjectOf<L>;
 /**
  * Helper type to convert any valid Lson type to the equivalent Json type.
  *
@@ -1268,13 +1286,9 @@ type LsonObject = Record<string, Lson | undefined>;
  *   ToJson<LiveObject<{ a: number, b: LiveList<string>, c?: number }>>
  *                                      // { readonly a: null, readonly b: readonly string[], readonly c?: number }
  */
-type ToJson<L extends Lson | LsonObject> = L extends LiveList<infer I extends Lson> ? Lson extends I ? readonly ReadonlyJson[] : readonly ToJson<I>[] : L extends LiveObject<infer O extends LsonObject> ? LsonObject extends O ? ReadonlyJsonObject : {
-    readonly [K in keyof O]: ToJson<Exclude<O[K], undefined>> | (undefined extends O[K] ? undefined : never);
-} : L extends LiveMap<infer KS extends string, infer V extends Lson> ? Lson extends V ? ReadonlyJsonObject : {
+type ToJson<L extends Lson | LsonObject> = L extends LiveList<infer I extends Lson> ? Lson extends I ? readonly ReadonlyJson[] : readonly ToJson<I>[] : L extends LiveObject<infer O extends LsonObject> ? JsonOfLsonObject<O> : L extends LiveMap<infer KS extends string, infer V extends Lson> ? Lson extends V ? ReadonlyJsonObject : {
     readonly [K in KS]: ToJson<V>;
-} : L extends LiveText ? LiveTextData : L extends LiveFile ? LiveFileData : L extends LsonObject ? string extends keyof L ? ReadonlyJsonObject : {
-    readonly [K in keyof L]: ToJson<Exclude<L[K], undefined>> | (undefined extends L[K] ? undefined : never);
-} : L extends Json ? L : never;
+} : L extends LiveText ? LiveTextData : L extends LiveFile ? LiveFileData : L extends LsonObject ? JsonOfLsonObject<L> : L extends Json ? L : never;
 
 /**
  * Read-only query surface over {@link UnacknowledgedOps}, handed to CRDTs so
@@ -1890,7 +1904,7 @@ type NotificationChannelSettings = {
  * Base definition of notification settings.
  * Plain means it's a simple object coming from the remote backend.
  *
- * It's the raw settings object where somme channels cannot exists
+ * It's the raw settings object where some channels cannot exists
  * because there are no notification kinds enabled on the dashboard.
  * And this object isn't yet proxied by the creator factory `createNotificationSettings`.
  */

package/dist/index.d.ts

@@ -1253,6 +1253,24 @@ type LiveNode = LiveStructure | LiveRegister<Json>;
  * value or a Live storage data structure (LiveMap, LiveList, etc.)
  */
 type LsonObject = Record<string, Lson | undefined>;
+/**
+ * The Json object an Lson object serializes to: every value converted with
+ * `ToJson`, optional keys staying optional.
+ */
+type JsonObjectOf<O extends LsonObject> = {
+    readonly [K in keyof O]: ToJson<Exclude<O[K], undefined>> | (undefined extends O[K] ? undefined : never);
+};
+/**
+ * The Json value a plain Lson object serializes to: an opaque record collapses
+ * to ReadonlyJsonObject, anything else is mapped key by key.
+ *
+ * Inferring V keeps this conditional resolvable, which ToJson's variance
+ * depends on. Deferring it makes unrelated assignments fail, such as
+ * LiveList<never> to Lson.
+ */
+type JsonOfLsonObject<L extends LsonObject> = string extends keyof L ? L extends Record<string, infer V> ? Record<string, V> extends L ? [
+    Json
+] extends [V] ? ReadonlyJsonObject : JsonObjectOf<L> : JsonObjectOf<L> : JsonObjectOf<L> : JsonObjectOf<L>;
 /**
  * Helper type to convert any valid Lson type to the equivalent Json type.
  *
@@ -1268,13 +1286,9 @@ type LsonObject = Record<string, Lson | undefined>;
  *   ToJson<LiveObject<{ a: number, b: LiveList<string>, c?: number }>>
  *                                      // { readonly a: null, readonly b: readonly string[], readonly c?: number }
  */
-type ToJson<L extends Lson | LsonObject> = L extends LiveList<infer I extends Lson> ? Lson extends I ? readonly ReadonlyJson[] : readonly ToJson<I>[] : L extends LiveObject<infer O extends LsonObject> ? LsonObject extends O ? ReadonlyJsonObject : {
-    readonly [K in keyof O]: ToJson<Exclude<O[K], undefined>> | (undefined extends O[K] ? undefined : never);
-} : L extends LiveMap<infer KS extends string, infer V extends Lson> ? Lson extends V ? ReadonlyJsonObject : {
+type ToJson<L extends Lson | LsonObject> = L extends LiveList<infer I extends Lson> ? Lson extends I ? readonly ReadonlyJson[] : readonly ToJson<I>[] : L extends LiveObject<infer O extends LsonObject> ? JsonOfLsonObject<O> : L extends LiveMap<infer KS extends string, infer V extends Lson> ? Lson extends V ? ReadonlyJsonObject : {
     readonly [K in KS]: ToJson<V>;
-} : L extends LiveText ? LiveTextData : L extends LiveFile ? LiveFileData : L extends LsonObject ? string extends keyof L ? ReadonlyJsonObject : {
-    readonly [K in keyof L]: ToJson<Exclude<L[K], undefined>> | (undefined extends L[K] ? undefined : never);
-} : L extends Json ? L : never;
+} : L extends LiveText ? LiveTextData : L extends LiveFile ? LiveFileData : L extends LsonObject ? JsonOfLsonObject<L> : L extends Json ? L : never;
 
 /**
  * Read-only query surface over {@link UnacknowledgedOps}, handed to CRDTs so
@@ -1890,7 +1904,7 @@ type NotificationChannelSettings = {
  * Base definition of notification settings.
  * Plain means it's a simple object coming from the remote backend.
  *
- * It's the raw settings object where somme channels cannot exists
+ * It's the raw settings object where some channels cannot exists
  * because there are no notification kinds enabled on the dashboard.
  * And this object isn't yet proxied by the creator factory `createNotificationSettings`.
  */

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.24.0";
+var PKG_VERSION = "3.24.2";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -3628,11 +3628,11 @@ var HttpClient = class {
     const response = await this.#fetchPolyfill(url2, {
       ...options,
       headers: {
-        // These headers are default, but can be overriden by custom headers
+        // These headers are default, but can be overridden by custom headers
         "Content-Type": "application/json; charset=utf-8",
         // Possible header overrides
         ...options?.headers,
-        // Cannot be overriden by custom headers
+        // Cannot be overridden by custom headers
         Authorization: `Bearer ${getBearerTokenFromAuthValue(authValue)}`,
         "X-LB-Client": PKG_VERSION || "dev"
       }
@@ -3678,7 +3678,7 @@ var HttpClient = class {
   }
   /**
    * Makes a GET request and returns the raw response.
-   * Won't throw if the reponse is a non-2xx.
+   * Won't throw if the response is a non-2xx.
    * @deprecated Ideally, use .get() instead.
    */
   async rawGet(endpoint, authValue, params, options) {
@@ -3686,7 +3686,7 @@ var HttpClient = class {
   }
   /**
    * Makes a POST request and returns the raw response.
-   * Won't throw if the reponse is a non-2xx.
+   * Won't throw if the response is a non-2xx.
    * @deprecated Ideally, use .post() instead.
    */
   async rawPost(endpoint, authValue, body) {
@@ -3697,7 +3697,7 @@ var HttpClient = class {
   }
   /**
    * Makes a DELETE request and returns the raw response.
-   * Won't throw if the reponse is a non-2xx.
+   * Won't throw if the response is a non-2xx.
    * @deprecated Ideally, use .delete() instead.
    */
   async rawDelete(endpoint, authValue) {
@@ -3705,14 +3705,14 @@ var HttpClient = class {
   }
   /**
    * Makes a GET request, and return the JSON response.
-   * Will throw if the reponse is a non-2xx.
+   * Will throw if the response is a non-2xx.
    */
   async get(endpoint, authValue, params, options) {
     return await this.#fetch(endpoint, authValue, options, params);
   }
   /**
    * Makes a POST request, and return the JSON response.
-   * Will throw if the reponse is a non-2xx.
+   * Will throw if the response is a non-2xx.
    */
   async post(endpoint, authValue, body, options, params) {
     return await this.#fetch(
@@ -3728,14 +3728,14 @@ var HttpClient = class {
   }
   /**
    * Makes a DELETE request, and return the JSON response.
-   * Will throw if the reponse is a non-2xx.
+   * Will throw if the response is a non-2xx.
    */
   async delete(endpoint, authValue) {
     return await this.#fetch(endpoint, authValue, { method: "DELETE" });
   }
   /**
    * Makes a PUT request for a Blob body, and return the JSON response.
-   * Will throw if the reponse is a non-2xx.
+   * Will throw if the response is a non-2xx.
    */
   async putBlob(endpoint, authValue, blob, params, options) {
     return await this.#fetch(
@@ -13721,7 +13721,7 @@ ${dumpPool(
       updateSubscriptionSettings,
       markInboxNotificationAsRead
     },
-    // Explictly make the internal field non-enumerable, to avoid aggressive
+    // Explicitly make the internal field non-enumerable, to avoid aggressive
     // freezing when used with Immer
     kInternal,
     { enumerable: false }