@kokimoki/app 1.10.1 → 1.10.2

package/dist/kokimoki-awareness.js

@@ -13,7 +13,7 @@ export class KokimokiAwareness extends KokimokiStore {
             clientId: z.string(),
             lastPing: z.number(),
             data: dataSchema,
-        })), mode);
+        })), {}, mode);
         this.dataSchema = dataSchema;
         this._data = _data;
         this._pingInterval = setInterval(async () => {

package/dist/kokimoki-client.d.ts

@@ -79,9 +79,9 @@ export declare class KokimokiClient<ClientContextT = any> extends KokimokiClient
     close(): Promise<void>;
     getRoomHash<T extends ZodType>(store: KokimokiStore<T>): number;
     /** Initializers */
-    store<T>(name: string, schema: ZodType<T>, autoJoin?: boolean): KokimokiStore<T>;
-    localStore<T>(name: string, schema: ZodType<T>): KokimokiLocalStore<T>;
-    awareness<T>(name: string, dataSchema: ZodType<T>, initialData?: T, autoJoin?: boolean): KokimokiAwareness<T>;
+    store<T>(name: string, schema: ZodType<T>, defaultState: T, autoJoin?: boolean): KokimokiStore<T>;
+    localStore<T>(name: string, schema: ZodType<T>, defaultState: T): KokimokiLocalStore<T>;
+    awareness<T>(name: string, dataSchema: ZodType<T>, initialData: T, autoJoin?: boolean): KokimokiAwareness<T>;
     /**
      * Add a new entry to a leaderboard
      * @param leaderboardName

package/dist/kokimoki-client.js

@@ -569,8 +569,8 @@ export class KokimokiClient extends EventEmitter {
     }
     /** Initializers */
     // store
-    store(name, schema, autoJoin = true) {
-        const store = new KokimokiStore(name, schema);
+    store(name, schema, defaultState, autoJoin = true) {
+        const store = new KokimokiStore(name, schema, defaultState);
         if (autoJoin) {
             this.join(store)
                 .then(() => { })
@@ -579,8 +579,8 @@ export class KokimokiClient extends EventEmitter {
         return store;
     }
     // local store
-    localStore(name, schema) {
-        const store = new KokimokiLocalStore(name, schema);
+    localStore(name, schema, defaultState) {
+        const store = new KokimokiLocalStore(name, schema, defaultState);
         this.join(store)
             .then(() => { })
             .catch(() => { });
@@ -602,7 +602,7 @@ export class KokimokiClient extends EventEmitter {
     //   return queue;
     // }
     // awareness
-    awareness(name, dataSchema, initialData = dataSchema.parse({}), autoJoin = true) {
+    awareness(name, dataSchema, initialData, autoJoin = true) {
         const awareness = new KokimokiAwareness(name, dataSchema, initialData);
         if (autoJoin) {
             this.join(awareness)

package/dist/kokimoki-local-store.d.ts

@@ -4,7 +4,7 @@ export declare class KokimokiLocalStore<Data> extends KokimokiStore<Data> {
     private readonly localRoomName;
     private _stateKey?;
     private get stateKey();
-    constructor(localRoomName: string, schema: ZodType<Data>);
+    constructor(localRoomName: string, schema: ZodType<Data>, defaultState: Data);
     getInitialUpdate(appId: string, clientId: string): {
         roomHash: number;
         initialUpdate: Uint8Array | undefined;

package/dist/kokimoki-local-store.js

@@ -11,8 +11,8 @@ export class KokimokiLocalStore extends KokimokiStore {
         }
         return this._stateKey;
     }
-    constructor(localRoomName, schema) {
-        super(`/l/${localRoomName}`, schema, RoomSubscriptionMode.ReadWrite);
+    constructor(localRoomName, schema, defaultState) {
+        super(`/l/${localRoomName}`, schema, defaultState, RoomSubscriptionMode.ReadWrite);
         this.localRoomName = localRoomName;
         // Synchronize doc changes to local storage
         // TODO: maybe do not serialize full state every time

package/dist/kokimoki-store.d.ts

@@ -4,13 +4,13 @@ import type { KokimokiClient } from "./kokimoki-client";
 import { ZodType } from "zod";
 export declare class KokimokiStore<T> {
     readonly roomName: string;
+    readonly schema: ZodType<T>;
+    readonly defaultValue: T;
     readonly mode: RoomSubscriptionMode;
     readonly doc: Y.Doc;
     readonly proxy: T;
-    readonly root: T;
-    readonly defaultValue: T;
     readonly docRoot: Y.Map<unknown>;
-    constructor(roomName: string, schema: ZodType<T>, mode?: RoomSubscriptionMode);
+    constructor(roomName: string, schema: ZodType<T>, defaultValue: T, mode?: RoomSubscriptionMode);
     get(): T;
     subscribe(set: (value: T) => void): () => void;
     onJoin(client: KokimokiClient): Promise<void>;

package/dist/kokimoki-store.js

@@ -1,18 +1,20 @@
 import * as Y from "yjs";
 import { proxy as yjsProxy } from "valtio";
 import { bind as yjsBind } from "valtio-yjs";
-import DeepProxy from "proxy-deep";
+// import DeepProxy from "proxy-deep";
 import { RoomSubscriptionMode } from "./room-subscription-mode";
 export class KokimokiStore {
     roomName;
+    schema;
+    defaultValue;
     mode;
     doc;
-    proxy; //T["defaultValue"];
-    root; //T["defaultValue"];
-    defaultValue; //T["defaultValue"];
+    proxy;
     docRoot;
-    constructor(roomName, schema, mode = RoomSubscriptionMode.ReadWrite) {
+    constructor(roomName, schema, defaultValue, mode = RoomSubscriptionMode.ReadWrite) {
         this.roomName = roomName;
+        this.schema = schema;
+        this.defaultValue = defaultValue;
         this.mode = mode;
         // Construct Y doc
         this.doc = new Y.Doc();
@@ -21,38 +23,34 @@ export class KokimokiStore {
         this.proxy = yjsProxy(); //T["defaultValue"];
         // @ts-ignore
         yjsBind(this.proxy, this.docRoot);
-        // Create root proxy
-        const store = this;
-        // @ts-ignore
-        this.root = new DeepProxy(this.proxy, {
-            get() {
-                return this.nest(function () { });
-            },
-            apply() {
-                let obj = store.proxy;
-                for (let i = 0; i < this.path.length - 1; i++) {
-                    obj = obj[this.path[i]];
-                }
-                return {
-                    roomName: store.roomName,
-                    doc: store.doc,
-                    path: this.path,
-                    obj,
-                    key: this.path[this.path.length - 1],
-                };
-            },
-        });
-        // Set default value
-        this.defaultValue = schema.parse({}); //schema.defaultValue;
+        // // Create root proxy
+        // const store = this;
+        // // @ts-ignore
+        // this.root = new DeepProxy(this.proxy, {
+        //   get() {
+        //     return this.nest(function () {});
+        //   },
+        //   apply() {
+        //     let obj: any = store.proxy;
+        //     for (let i = 0; i < this.path.length - 1; i++) {
+        //       obj = obj[this.path[i]];
+        //     }
+        //     return {
+        //       roomName: store.roomName,
+        //       doc: store.doc,
+        //       path: this.path,
+        //       obj,
+        //       key: this.path[this.path.length - 1],
+        //     };
+        //   },
+        // });
     }
     get() {
         return this.proxy;
     }
     subscribe(set) {
-        // @ts-ignore
         const handler = () => set(this.proxy);
         this.doc.on("update", handler);
-        // @ts-ignore
         set(this.proxy);
         return () => this.doc.off("update", handler);
     }

package/dist/kokimoki.min.d.ts

@@ -33,13 +33,13 @@ declare enum RoomSubscriptionMode {
 
 declare class KokimokiStore<T> {
     readonly roomName: string;
+    readonly schema: ZodType<T>;
+    readonly defaultValue: T;
     readonly mode: RoomSubscriptionMode;
     readonly doc: Y.Doc;
     readonly proxy: T;
-    readonly root: T;
-    readonly defaultValue: T;
     readonly docRoot: Y.Map<unknown>;
-    constructor(roomName: string, schema: ZodType<T>, mode?: RoomSubscriptionMode);
+    constructor(roomName: string, schema: ZodType<T>, defaultValue: T, mode?: RoomSubscriptionMode);
     get(): T;
     subscribe(set: (value: T) => void): () => void;
     onJoin(client: KokimokiClient): Promise<void>;
@@ -72,7 +72,7 @@ declare class KokimokiLocalStore<Data> extends KokimokiStore<Data> {
     private readonly localRoomName;
     private _stateKey?;
     private get stateKey();
-    constructor(localRoomName: string, schema: ZodType<Data>);
+    constructor(localRoomName: string, schema: ZodType<Data>, defaultState: Data);
     getInitialUpdate(appId: string, clientId: string): {
         roomHash: number;
         initialUpdate: Uint8Array | undefined;
@@ -152,9 +152,9 @@ declare class KokimokiClient<ClientContextT = any> extends KokimokiClient_base {
     close(): Promise<void>;
     getRoomHash<T extends ZodType>(store: KokimokiStore<T>): number;
     /** Initializers */
-    store<T>(name: string, schema: ZodType<T>, autoJoin?: boolean): KokimokiStore<T>;
-    localStore<T>(name: string, schema: ZodType<T>): KokimokiLocalStore<T>;
-    awareness<T>(name: string, dataSchema: ZodType<T>, initialData?: T, autoJoin?: boolean): KokimokiAwareness<T>;
+    store<T>(name: string, schema: ZodType<T>, defaultState: T, autoJoin?: boolean): KokimokiStore<T>;
+    localStore<T>(name: string, schema: ZodType<T>, defaultState: T): KokimokiLocalStore<T>;
+    awareness<T>(name: string, dataSchema: ZodType<T>, initialData: T, autoJoin?: boolean): KokimokiAwareness<T>;
     /**
      * Add a new entry to a leaderboard
      * @param leaderboardName

package/dist/kokimoki.min.js

@@ -486,7 +486,7 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 var eventsExports = events.exports;
 var EventEmitter$1 = /*@__PURE__*/getDefaultExportFromCjs(eventsExports);
 
-const KOKIMOKI_APP_VERSION = "1.10.1";
+const KOKIMOKI_APP_VERSION = "1.10.2";
 
 /**
  * Utility module to work with key-value stores.
@@ -890,7 +890,7 @@ const assign = Object.assign;
 /**
  * @param {Object<string,any>} obj
  */
-const keys$1 = Object.keys;
+const keys = Object.keys;
 
 /**
  * @template V
@@ -907,7 +907,7 @@ const forEach$2 = (obj, f) => {
  * @param {Object<string,any>} obj
  * @return {number}
  */
-const length$1 = obj => keys$1(obj).length;
+const length$1 = obj => keys(obj).length;
 
 /**
  * @param {Object|undefined} obj
@@ -11389,110 +11389,6 @@ class KokimokiTransaction {
     }
 }
 
-function parsePath(text) {
-  return text.split('.')
-}
-
-function push(arr, el) {
-  const newArr = arr.slice();
-  newArr.push(el);
-  return newArr;
-}
-
-// names of the traps that can be registered with ES6's Proxy object
-const trapNames = [
-  'apply',
-  'construct',
-  'defineProperty',
-  'deleteProperty',
-  'enumerate', // deprecated
-  'get',
-  'getOwnPropertyDescriptor',
-  'getPrototypeOf',
-  'has',
-  'isExtensible',
-  'ownKeys',
-  'preventExtensions',
-  'set',
-  'setPrototypeOf',
-];
-
-// a list of paramer indexes that indicate that the a recieves a key at that parameter
-// this information will be used to update the path accordingly
-const keys = {
-  get: 1,
-  set: 1,
-  deleteProperty: 1,
-  has: 1,
-  defineProperty: 1,
-  getOwnPropertyDescriptor: 1,
-};
-
-function DeepProxy(rootTarget, traps, options) {
-
-  let path = [];
-  let userData = {};
-
-  if (options !== undefined && typeof options.path !== 'undefined') {
-    path = parsePath(options.path);
-  }
-  if (options !== undefined && typeof options.userData !== 'undefined') {
-    userData = options.userData;
-  }
-
-  function createProxy(target, path) {
-
-    // avoid creating a new object between two traps
-    const context = { rootTarget, path };
-    Object.assign(context, userData);
-
-    const realTraps = {};
-
-    for (const trapName of trapNames) {
-      const keyParamIdx = keys[trapName]
-          , trap = traps[trapName];
-
-      if (typeof trap !== 'undefined') {
-
-        if (typeof keyParamIdx !== 'undefined') {
-
-          realTraps[trapName] = function () {
-
-            const key = arguments[keyParamIdx];
-
-            // update context for this trap
-            context.nest = function (nestedTarget) {
-              if (nestedTarget === undefined)
-                nestedTarget = rootTarget;
-              return createProxy(nestedTarget, push(path, key)); 
-            };
-
-            return trap.apply(context, arguments);
-          };
-        } else {
-
-          realTraps[trapName] = function () {
-
-            // update context for this trap
-            context.nest = function (nestedTarget) {
-              if (nestedTarget === undefined)
-                nestedTarget = {};
-              return createProxy(nestedTarget, path);
-            };
-
-            return trap.apply(context, arguments);
-          };
-        }
-      }
-    }
-
-    return new Proxy(target, realTraps);
-  }
-
-  return createProxy(rootTarget, path);
-
-}
-
 var RoomSubscriptionMode;
 (function (RoomSubscriptionMode) {
     RoomSubscriptionMode["Read"] = "r";
@@ -11502,14 +11398,16 @@ var RoomSubscriptionMode;
 
 class KokimokiStore {
     roomName;
+    schema;
+    defaultValue;
     mode;
     doc;
-    proxy; //T["defaultValue"];
-    root; //T["defaultValue"];
-    defaultValue; //T["defaultValue"];
+    proxy;
     docRoot;
-    constructor(roomName, schema, mode = RoomSubscriptionMode.ReadWrite) {
+    constructor(roomName, schema, defaultValue, mode = RoomSubscriptionMode.ReadWrite) {
         this.roomName = roomName;
+        this.schema = schema;
+        this.defaultValue = defaultValue;
         this.mode = mode;
         // Construct Y doc
         this.doc = new Doc();
@@ -11518,38 +11416,34 @@ class KokimokiStore {
         this.proxy = proxy(); //T["defaultValue"];
         // @ts-ignore
         f(this.proxy, this.docRoot);
-        // Create root proxy
-        const store = this;
-        // @ts-ignore
-        this.root = new DeepProxy(this.proxy, {
-            get() {
-                return this.nest(function () { });
-            },
-            apply() {
-                let obj = store.proxy;
-                for (let i = 0; i < this.path.length - 1; i++) {
-                    obj = obj[this.path[i]];
-                }
-                return {
-                    roomName: store.roomName,
-                    doc: store.doc,
-                    path: this.path,
-                    obj,
-                    key: this.path[this.path.length - 1],
-                };
-            },
-        });
-        // Set default value
-        this.defaultValue = schema.parse({}); //schema.defaultValue;
+        // // Create root proxy
+        // const store = this;
+        // // @ts-ignore
+        // this.root = new DeepProxy(this.proxy, {
+        //   get() {
+        //     return this.nest(function () {});
+        //   },
+        //   apply() {
+        //     let obj: any = store.proxy;
+        //     for (let i = 0; i < this.path.length - 1; i++) {
+        //       obj = obj[this.path[i]];
+        //     }
+        //     return {
+        //       roomName: store.roomName,
+        //       doc: store.doc,
+        //       path: this.path,
+        //       obj,
+        //       key: this.path[this.path.length - 1],
+        //     };
+        //   },
+        // });
     }
     get() {
         return this.proxy;
     }
     subscribe(set) {
-        // @ts-ignore
         const handler = () => set(this.proxy);
         this.doc.on("update", handler);
-        // @ts-ignore
         set(this.proxy);
         return () => this.doc.off("update", handler);
     }
@@ -16118,7 +16012,7 @@ class KokimokiAwareness extends KokimokiStore {
             clientId: z.string(),
             lastPing: z.number(),
             data: dataSchema,
-        })), mode);
+        })), {}, mode);
         this.dataSchema = dataSchema;
         this._data = _data;
         this._pingInterval = setInterval(async () => {
@@ -18726,8 +18620,8 @@ class KokimokiLocalStore extends KokimokiStore {
         }
         return this._stateKey;
     }
-    constructor(localRoomName, schema) {
-        super(`/l/${localRoomName}`, schema, RoomSubscriptionMode.ReadWrite);
+    constructor(localRoomName, schema, defaultState) {
+        super(`/l/${localRoomName}`, schema, defaultState, RoomSubscriptionMode.ReadWrite);
         this.localRoomName = localRoomName;
         // Synchronize doc changes to local storage
         // TODO: maybe do not serialize full state every time
@@ -19312,8 +19206,8 @@ class KokimokiClient extends EventEmitter$1 {
     }
     /** Initializers */
     // store
-    store(name, schema, autoJoin = true) {
-        const store = new KokimokiStore(name, schema);
+    store(name, schema, defaultState, autoJoin = true) {
+        const store = new KokimokiStore(name, schema, defaultState);
         if (autoJoin) {
             this.join(store)
                 .then(() => { })
@@ -19322,8 +19216,8 @@ class KokimokiClient extends EventEmitter$1 {
         return store;
     }
     // local store
-    localStore(name, schema) {
-        const store = new KokimokiLocalStore(name, schema);
+    localStore(name, schema, defaultState) {
+        const store = new KokimokiLocalStore(name, schema, defaultState);
         this.join(store)
             .then(() => { })
             .catch(() => { });
@@ -19345,7 +19239,7 @@ class KokimokiClient extends EventEmitter$1 {
     //   return queue;
     // }
     // awareness
-    awareness(name, dataSchema, initialData = dataSchema.parse({}), autoJoin = true) {
+    awareness(name, dataSchema, initialData, autoJoin = true) {
         const awareness = new KokimokiAwareness(name, dataSchema, initialData);
         if (autoJoin) {
             this.join(awareness)