rhine-var 0.1.7 → 0.2.0

package/dist/core/event/Callback.d.ts

@@ -1,4 +1,4 @@
 import { ChangeType } from "./ChangeType";
 import { Transaction, YArrayEvent, YMapEvent } from "yjs";
-export type Callback = (value: any, key: string, oldValue: any, type: ChangeType, nativeEvent: YMapEvent<any> | YArrayEvent<any>, nativeTransaction: Transaction) => void;
+export type Callback<T> = (value: T[keyof T], key: keyof T, oldValue: T[keyof T], type: ChangeType, nativeEvent: YMapEvent<any> | YArrayEvent<any>, nativeTransaction: Transaction) => void;
 //# sourceMappingURL=Callback.d.ts.map

package/dist/core/event/Callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Callback.d.ts","sourceRoot":"","sources":["../../../src/core/event/Callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,qBAAgC;AACnD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAExD,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAA"}
+{"version":3,"file":"Callback.d.ts","sourceRoot":"","sources":["../../../src/core/event/Callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,qBAAgC;AACnD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAExD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CACxB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACjB,GAAG,EAAE,MAAM,CAAC,EACZ,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACpB,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAC9C,iBAAiB,EAAE,WAAW,KAC3B,IAAI,CAAA"}

package/dist/core/event/ChangeType.d.ts

@@ -1,6 +1,7 @@
 export declare enum ChangeType {
     Add = "add",
     Update = "update",
-    Delete = "delete"
+    Delete = "delete",
+    Sync = "sync"
 }
 //# sourceMappingURL=ChangeType.d.ts.map

package/dist/core/event/ChangeType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChangeType.d.ts","sourceRoot":"","sources":["../../../src/core/event/ChangeType.ts"],"names":[],"mappings":"AACA,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB"}
+{"version":3,"file":"ChangeType.d.ts","sourceRoot":"","sources":["../../../src/core/event/ChangeType.ts"],"names":[],"mappings":"AACA,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd"}

package/dist/core/event/ChangeType.js

@@ -6,4 +6,5 @@ var ChangeType;
     ChangeType["Add"] = "add";
     ChangeType["Update"] = "update";
     ChangeType["Delete"] = "delete";
+    ChangeType["Sync"] = "sync";
 })(ChangeType || (exports.ChangeType = ChangeType = {}));

package/dist/core/native/NativeUtils.d.ts

@@ -1,8 +1,7 @@
-import { Map as YMap, Array as YArray } from "yjs";
 import { Native } from "./Native";
-export declare function isYMapOrYArray(value: any): value is YMap<any> | YArray<any>;
+export declare function isNative(value: any): boolean;
 export declare function nativeSet(target: Native, key: string | symbol, value: any): boolean;
 export declare function nativeDelete(target: Native, key: string | symbol): boolean;
-export declare function nativeGet(target: Native, key: string | symbol): any;
-export declare function jsonToNative(data: any): any;
+export declare function nativeGet(target: Native, key: string | symbol): any | undefined;
+export declare function jsonToNative(data: any): Native | any;
 //# sourceMappingURL=NativeUtils.d.ts.map

package/dist/core/native/NativeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeUtils.d.ts","sourceRoot":"","sources":["../../../src/core/native/NativeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAE,KAAK,IAAI,MAAM,EAAC,MAAM,KAAK,CAAA;AAChD,OAAO,EAAC,MAAM,EAAC,iBAA6B;AAI5C,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,oCAExC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,WAuBzE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,WAwBhE;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,OAgB7D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,OAgBrC"}
+{"version":3,"file":"NativeUtils.d.ts","sourceRoot":"","sources":["../../../src/core/native/NativeUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,iBAA6B;AAI5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE5C;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAuBnF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAwB1E;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,GAAG,SAAS,CAgB/E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,GAAG,CAgBpD"}

package/dist/core/native/NativeUtils.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isYMapOrYArray = isYMapOrYArray;
+exports.isNative = isNative;
 exports.nativeSet = nativeSet;
 exports.nativeDelete = nativeDelete;
 exports.nativeGet = nativeGet;
 exports.jsonToNative = jsonToNative;
 const yjs_1 = require("yjs");
 const DataUtils_1 = require("../utils/DataUtils");
-function isYMapOrYArray(value) {
+function isNative(value) {
     return (value instanceof yjs_1.Map) || (value instanceof yjs_1.Array);
 }
 function nativeSet(target, key, value) {

package/dist/core/proxy/DirectKey.d.ts

@@ -0,0 +1,5 @@
+export declare const DIRECT_KEY_PREVIOUS = "RHINE_VAR_DIRECT_PACKAGE_PREFIX_";
+export declare function directKey(key: string | number): string;
+export declare function isDirectKey(key: string | any): boolean;
+export declare function originKey(key: string | symbol | number): string | symbol | number;
+//# sourceMappingURL=DirectKey.d.ts.map

package/dist/core/proxy/DirectKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DirectKey.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/DirectKey.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,qCAAqC,CAAA;AAErE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,UAE7C;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,WAE5C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAajF"}

package/dist/core/proxy/DirectKey.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DIRECT_KEY_PREVIOUS = void 0;
+exports.directKey = directKey;
+exports.isDirectKey = isDirectKey;
+exports.originKey = originKey;
+exports.DIRECT_KEY_PREVIOUS = 'RHINE_VAR_DIRECT_PACKAGE_PREFIX_';
+function directKey(key) {
+    return exports.DIRECT_KEY_PREVIOUS + key;
+}
+function isDirectKey(key) {
+    return typeof key === 'string' && key.startsWith(exports.DIRECT_KEY_PREVIOUS);
+}
+function originKey(key) {
+    if (typeof key === 'number')
+        key = String(key);
+    if (typeof key !== 'string')
+        return key;
+    if (key.startsWith(exports.DIRECT_KEY_PREVIOUS)) {
+        key = key.split(exports.DIRECT_KEY_PREVIOUS)[1];
+        let kn = parseInt(key);
+        if (isNaN(kn)) {
+            return key;
+        }
+        else {
+            return kn;
+        }
+    }
+    return key;
+}

package/dist/core/proxy/DirectPackage.d.ts

@@ -1,6 +1,4 @@
-export default class DirectPackage {
-    data: any;
-    constructor(data: any);
-}
-export declare function directPackage(data: any): DirectPackage;
+export declare const DIRECT_KEY_PREVIOUS = "RHINE_VAR_DIRECT_PACKAGE_PREFIX - ";
+export declare function directKey(key: string): string;
+export declare function isDirectKey(key: string): boolean;
 //# sourceMappingURL=DirectPackage.d.ts.map

package/dist/core/proxy/DirectPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DirectPackage.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/DirectPackage.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,aAAa;IAEvB,IAAI,EAAE,GAAG;gBAAT,IAAI,EAAE,GAAG;CAEnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,iBAEtC"}
+{"version":3,"file":"DirectPackage.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/DirectPackage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uCAAuC,CAAA;AAEvE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,UAEpC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,WAEtC"}

package/dist/core/proxy/DirectPackage.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.directPackage = directPackage;
-class DirectPackage {
-    constructor(data) {
-        this.data = data;
-    }
+exports.DIRECT_KEY_PREVIOUS = void 0;
+exports.directKey = directKey;
+exports.isDirectKey = isDirectKey;
+exports.DIRECT_KEY_PREVIOUS = 'RHINE_VAR_DIRECT_PACKAGE_PREFIX - ';
+function directKey(key) {
+    return exports.DIRECT_KEY_PREVIOUS + key;
 }
-exports.default = DirectPackage;
-function directPackage(data) {
-    return new DirectPackage(data);
+function isDirectKey(key) {
+    return key.startsWith(exports.DIRECT_KEY_PREVIOUS);
 }

package/dist/core/proxy/KeyWithDirectFlag.d.ts

@@ -0,0 +1,8 @@
+type keyType = string | symbol | number;
+export default class KeyWithDirectFlag {
+    value: keyType;
+    constructor(value: keyType);
+}
+export declare function directKey(value: keyType): KeyWithDirectFlag;
+export {};
+//# sourceMappingURL=KeyWithDirectFlag.d.ts.map

package/dist/core/proxy/KeyWithDirectFlag.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyWithDirectFlag.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/KeyWithDirectFlag.ts"],"names":[],"mappings":"AACA,KAAK,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAEvC,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAE3B,KAAK,EAAE,OAAO;gBAAd,KAAK,EAAE,OAAO;CAExB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,qBAEvC"}

package/dist/core/proxy/KeyWithDirectFlag.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.directKey = directKey;
+class KeyWithDirectFlag {
+    constructor(value) {
+        this.value = value;
+    }
+}
+exports.default = KeyWithDirectFlag;
+function directKey(value) {
+    return new KeyWithDirectFlag(value);
+}

package/dist/core/proxy/ProxiedRhineVar.d.ts

@@ -1,6 +1,6 @@
 import RhineVar from "./RhineVar";
 export type RecursiveCrossRhineVar<T> = {
-    [K in keyof T]: T[K] extends object ? RecursiveCrossRhineVar<T[K]> & RhineVar : T[K];
+    [K in keyof T]: T[K] extends object ? RecursiveCrossRhineVar<T[K]> & RhineVar<T[K]> : T[K];
 };
-export type ProxiedRhineVar<T> = T & RecursiveCrossRhineVar<T> & RhineVar;
+export type ProxiedRhineVar<T> = T & RecursiveCrossRhineVar<T> & RhineVar<T>;
 //# sourceMappingURL=ProxiedRhineVar.d.ts.map

package/dist/core/proxy/ProxiedRhineVar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/ProxiedRhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,mBAA8B;AAE7C,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACrC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;CACrF,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"ProxiedRhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/ProxiedRhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,mBAA8B;AAE7C,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACrC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3F,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA"}

package/dist/core/proxy/Proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Proxy.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/Proxy.ts"],"names":[],"mappings":"AACA,OAAO,uBAAgD,6CAAiD;AAKxG,OAAO,EAAC,eAAe,EAAC,0BAAqC;AAC7D,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAK5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,IAAI,EAAE,CAAC,EACP,SAAS,GAAE,uBAAuB,GAAG,MAAM,GAAG,IAAW,EACzD,SAAS,GAAE,OAAe,GACzB,eAAe,CAAC,CAAC,CAAC,CA2CpB;AAGD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CA4DrF"}
+{"version":3,"file":"Proxy.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/Proxy.ts"],"names":[],"mappings":"AACA,OAAO,uBAAgD,6CAAiD;AAKxG,OAAO,EAAC,eAAe,EAAC,0BAAqC;AAC7D,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAM5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,IAAI,EAAE,CAAC,EACP,SAAS,GAAE,uBAAuB,GAAG,MAAM,GAAG,IAAW,EACzD,SAAS,GAAE,OAAe,GACzB,eAAe,CAAC,CAAC,CAAC,CA6CpB;AAGD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CA8DrF"}

package/dist/core/proxy/Proxy.js

@@ -32,7 +32,7 @@ const DataUtils_1 = require("../utils/DataUtils");
 const Logger_1 = require("../utils/Logger");
 const ConvertProperty_1 = require("../utils/ConvertProperty");
 const NativeUtils_1 = require("../native/NativeUtils");
-const DirectPackage_1 = __importStar(require("./DirectPackage"));
+const DirectKey_1 = require("./DirectKey");
 function rhineProxy(data, connector = null, overwrite = false) {
     let target = (0, NativeUtils_1.jsonToNative)(data);
     if (connector) {
@@ -49,26 +49,26 @@ function rhineProxy(data, connector = null, overwrite = false) {
     object.connector = connector;
     if (connector && !connector.synced) {
         connector.addSyncedListener((synced) => {
-            if (!synced)
-                return;
-            let syncedValue = target.clone();
-            if (!overwrite && connector.yBaseMap.has(WebsocketRhineConnector_1.default.STATE_KEY)) {
-                syncedValue = connector.yBaseMap.get(WebsocketRhineConnector_1.default.STATE_KEY);
-                object.native.forEach((value, key) => {
-                    Reflect.deleteProperty(object, key);
-                });
-                object.unobserve();
-                object.native = syncedValue;
-                object.observe();
-                (0, Logger_1.log)('Proxy.synced: Update synced native');
-                syncedValue.forEach((value, key) => {
-                    if ((0, NativeUtils_1.isYMapOrYArray)(value)) {
-                        Reflect.set(object, key, (0, DirectPackage_1.directPackage)(rhineProxyNative(value)));
-                    }
-                });
-            }
-            else {
-                connector.yBaseMap.set(WebsocketRhineConnector_1.default.STATE_KEY, syncedValue);
+            if (synced) {
+                let syncedValue = target.clone();
+                if (!overwrite && connector.yBaseMap.has(WebsocketRhineConnector_1.default.STATE_KEY)) {
+                    syncedValue = connector.yBaseMap.get(WebsocketRhineConnector_1.default.STATE_KEY);
+                    object.native.forEach((value, key) => {
+                        Reflect.deleteProperty(object, (0, DirectKey_1.directKey)(key));
+                    });
+                    object.unobserve();
+                    object.native = syncedValue;
+                    object.observe();
+                    (0, Logger_1.log)('Proxy.synced: Update synced native');
+                    syncedValue.forEach((value, key) => {
+                        if ((0, NativeUtils_1.isNative)(value)) {
+                            Reflect.set(object, (0, DirectKey_1.directKey)(key), rhineProxyNative(value));
+                        }
+                    });
+                }
+                else {
+                    connector.yBaseMap.set(WebsocketRhineConnector_1.default.STATE_KEY, syncedValue);
+                }
             }
         });
     }
@@ -79,19 +79,21 @@ function rhineProxyNative(target) {
     const object = new RhineVar_1.default(target);
     object.native.forEach((value, keyString) => {
         let key = keyString;
-        if ((0, NativeUtils_1.isYMapOrYArray)(value)) {
+        if ((0, NativeUtils_1.isNative)(value)) {
             Reflect.set(object, key, rhineProxyNative(value));
         }
     });
     const handler = {
         get(proxy, p, receiver) {
+            if ((0, DirectKey_1.isDirectKey)(p))
+                return Reflect.get(object, (0, DirectKey_1.originKey)(p), receiver);
             if (RhineVar_1.RHINE_VAR_KEYS.has(p))
                 return Reflect.get(object, p, receiver);
             (0, Logger_1.log)('Proxy.handler.get:', p, '\n', object, receiver);
             if (p in object)
                 return Reflect.get(object, p, receiver);
             let result = (0, NativeUtils_1.nativeGet)(object.native, p);
-            if (result)
+            if (result !== undefined)
                 return result;
             if (object.native instanceof yjs_1.Array) {
                 if (typeof p === 'string') {
@@ -103,10 +105,10 @@ function rhineProxyNative(target) {
             return undefined;
         },
         set(proxy, p, value, receiver) {
+            if ((0, DirectKey_1.isDirectKey)(p))
+                return Reflect.set(object, (0, DirectKey_1.originKey)(p), value.data, receiver);
             if (RhineVar_1.RHINE_VAR_KEYS.has(p))
                 return Reflect.set(object, p, value, receiver);
-            if (value instanceof DirectPackage_1.default)
-                return Reflect.set(object, p, value.data, receiver);
             (0, Logger_1.log)('Proxy.handler.set:', p, 'to', value, '\n', object, receiver);
             value = (0, DataUtils_1.ensureRhineVar)(value);
             let result = false;
@@ -121,6 +123,8 @@ function rhineProxyNative(target) {
             return result;
         },
         deleteProperty(proxy, p) {
+            if ((0, DirectKey_1.isDirectKey)(p))
+                return Reflect.deleteProperty(object, (0, DirectKey_1.originKey)(p));
             if (RhineVar_1.RHINE_VAR_KEYS.has(p))
                 return false;
             (0, Logger_1.log)('Proxy.handler.deleteProperty:', p);

package/dist/core/proxy/RhineVar.d.ts

@@ -3,20 +3,18 @@ import WebsocketRhineConnector from "../connector/WebsocketRhineConnector";
 import { Native } from "../native/Native";
 import { ChangeType } from "../event/ChangeType";
 import { Callback } from "../event/Callback";
-export default class RhineVar {
+export default class RhineVar<T> {
     native: Native;
     constructor(native: Native);
     connector: WebsocketRhineConnector | null;
-    json(): any[] | {
-        [x: string]: any;
-    };
+    json(): T;
     private listeners;
-    subscribe(callback: Callback): () => void;
-    unsubscribe(callback: Callback): void;
+    subscribe(callback: Callback<T>): () => void;
+    unsubscribe(callback: Callback<T>): void;
     private keyListeners;
-    subscribeKey(key: string, callback: Callback): () => void;
-    unsubscribeKey(callback: Callback): void;
-    emit(value: any, key: string, oldValue: any, type: ChangeType, nativeEvent: YMapEvent<any> | YArrayEvent<any>, nativeTransaction: Transaction): void;
+    subscribeKey(key: keyof T, callback: Callback<T>): () => void;
+    unsubscribeKey(callback: Callback<T>): void;
+    emit(value: T[keyof T], key: keyof T, oldValue: T[keyof T], type: ChangeType, nativeEvent: YMapEvent<any> | YArrayEvent<any>, nativeTransaction: Transaction): void;
     observer: (event: YMapEvent<any> | YArrayEvent<any>, transaction: Transaction) => void;
     observe(): void;
     unobserve(): void;

package/dist/core/proxy/RhineVar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAEtF,OAAO,uBAAuB,6CAAiD;AAG/E,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAC,0BAA8B;AAG/C,MAAM,CAAC,OAAO,OAAO,QAAQ;IAGlB,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAGvB,SAAS,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAEzC,IAAI;;;IAIX,OAAO,CAAC,SAAS,CAAiB;IAClC,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,IAAI;IAIzC,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,OAAO,CAAC,YAAY,CAAqC;IACzD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,IAAI;IAOzD,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAMjC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAO7I,QAAQ,UAAW,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,WAAW,UAAO;IAGrF,OAAO;IA+BP,SAAS;CAMV;AAED,eAAO,MAAM,cAAc,sBAczB,CAAA"}
+{"version":3,"file":"RhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAEtF,OAAO,uBAAuB,6CAAiD;AAG/E,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAC,0BAA8B;AAG/C,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC;IAGpB,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAGvB,SAAS,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAEzC,IAAI,IAAI,CAAC;IAIhB,OAAO,CAAC,SAAS,CAAoB;IACrC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAI5C,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAIjC,OAAO,CAAC,YAAY,CAAyC;IAC7D,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAO7D,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAMpC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAO5J,QAAQ,UAAW,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,WAAW,UAAO;IAGrF,OAAO;IA+BP,SAAS;CAMV;AAED,eAAO,MAAM,cAAc,sBAczB,CAAA"}

package/dist/core/utils/ConvertProperty.d.ts

@@ -1,4 +1,4 @@
 import { Array as YArray } from "yjs";
 import RhineVar from "../proxy/RhineVar";
-export declare function convertArrayProperty<T>(target: YArray<T>, name: string, object: RhineVar): number | ((item: T | RhineVar) => void) | ((...items: T[]) => number) | ((start: number, deleteCount: number, ...items: T[]) => T[]) | ((callback: (value: T, index: number, arr: YArray<any>) => void) => void) | ((item: T) => boolean) | undefined;
+export declare function convertArrayProperty<T>(target: YArray<T>, name: string, object: RhineVar<T>): number | ((item: T | RhineVar<T>) => void) | ((...items: T[]) => number) | ((start: number, deleteCount: number, ...items: T[]) => T[]) | ((callback: (value: T, index: number, arr: YArray<any>) => void) => void) | ((item: T) => boolean) | undefined;
 //# sourceMappingURL=ConvertProperty.d.ts.map

package/dist/core/utils/ConvertProperty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConvertProperty.d.ts","sourceRoot":"","sources":["../../../src/core/utils/ConvertProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,MAAM,EAAC,MAAM,KAAK,CAAC;AACpC,OAAO,QAAQ,0BAA8B;AAG7C,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,oBAIvE,CAAC,GAAG,QAAQ,yBAsBR,CAAC,EAAE,wBASN,MAAM,eAAe,MAAM,YAAY,CAAC,EAAE,wBASvC,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,qBAevD,CAAC,0BAOlB"}
+{"version":3,"file":"ConvertProperty.d.ts","sourceRoot":"","sources":["../../../src/core/utils/ConvertProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,MAAM,EAAC,MAAM,KAAK,CAAC;AACpC,OAAO,QAAQ,0BAA8B;AAK7C,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,oBAI1E,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAG,IAAI,gBAyBlB,CAAC,EAAE,wBASN,MAAM,eAAe,MAAM,YAAY,CAAC,EAAE,wBASvC,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,qBAevD,CAAC,0BAOlB"}

package/dist/core/utils/ConvertProperty.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertArrayProperty = convertArrayProperty;
 const RhineVar_1 = __importDefault(require("../proxy/RhineVar"));
 const DataUtils_1 = require("./DataUtils");
+const NativeUtils_1 = require("../native/NativeUtils");
 function convertArrayProperty(target, name, object) {
     if (name === 'length') {
         return target.length;
@@ -15,7 +16,6 @@ function convertArrayProperty(target, name, object) {
             item = (0, DataUtils_1.ensureRhineVar)(item);
             if (item instanceof RhineVar_1.default) {
                 target.push([item.native]);
-                Reflect.set(object, target.length - 1, item);
             }
             else {
                 target.push([item]);
@@ -24,8 +24,12 @@ function convertArrayProperty(target, name, object) {
     }
     else if (name === 'pop') {
         return () => {
-            let item = target.get(target.length - 1);
-            target.delete(target.length - 1);
+            let key = target.length - 1;
+            let item = target.get(key);
+            target.delete(key);
+            if ((0, NativeUtils_1.isNative)(item)) {
+                return item.toJSON();
+            }
             return item;
         };
     }

package/dist/core/utils/DataUtils.d.ts

@@ -1,6 +1,7 @@
 import { ProxiedRhineVar } from "../proxy/ProxiedRhineVar";
+import { Native } from "../native/Native";
 export declare function isObject(value: any): boolean;
 export declare function isArray(value: any): value is any[];
 export declare function isObjectOrArray(value: any): boolean;
-export declare function ensureRhineVar<T>(value: T | ProxiedRhineVar<T>): ProxiedRhineVar<T> | any;
+export declare function ensureRhineVar<T>(value: T | Native): ProxiedRhineVar<T> | any;
 //# sourceMappingURL=DataUtils.d.ts.map

package/dist/core/utils/DataUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataUtils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/DataUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,iCAAqC;AAK7D,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,WAElC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,kBAEjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,WAEzC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,GAAG,CAUzF"}
+{"version":3,"file":"DataUtils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/DataUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,iCAAqC;AAI7D,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAE5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,WAElC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,kBAEjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,WAEzC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,GAAG,CAU7E"}

package/dist/core/utils/DataUtils.js

@@ -20,7 +20,7 @@ function isObjectOrArray(value) {
     return value !== null && typeof value === 'object';
 }
 function ensureRhineVar(value) {
-    if ((0, NativeUtils_1.isYMapOrYArray)(value)) {
+    if ((0, NativeUtils_1.isNative)(value)) {
         return (0, Proxy_1.rhineProxyNative)(value);
     }
     if (isObjectOrArray(value)) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { rhineProxy, rhineProxyNative } from "./core/proxy/Proxy";
 import RhineVar from "./core/proxy/RhineVar";
 import { ProxiedRhineVar, RecursiveCrossRhineVar } from "./core/proxy/ProxiedRhineVar";
-import DirectPackage from "./core/proxy/DirectPackage";
+import DirectPackage from "./core/proxy/DirectKey";
 import WebsocketRhineConnector from "./core/connector/WebsocketRhineConnector";
 import useRhine from "./react/hooks/useRhine";
 import useSynced from "./react/hooks/useSynced";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,2BAA2B;AAChE,OAAO,QAAQ,8BAA8B;AAC7C,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAC,qCAAqC;AACrF,OAAO,aAAa,mCAAmC;AACvD,OAAO,uBAAuB,iDAAiD;AAC/E,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAE/C,OAAO,EACL,uBAAuB,EACvB,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,SAAS,GACV,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,2BAA2B;AAChE,OAAO,QAAQ,8BAA8B;AAC7C,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAC,qCAAqC;AACrF,OAAO,aAAa,+BAA+B;AACnD,OAAO,uBAAuB,iDAAiD;AAC/E,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAE/C,OAAO,EACL,uBAAuB,EACvB,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,SAAS,GACV,CAAA"}

package/dist/index.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "rhineProxy", { enumerable: true, get: function (
 Object.defineProperty(exports, "rhineProxyNative", { enumerable: true, get: function () { return Proxy_1.rhineProxyNative; } });
 const RhineVar_1 = __importDefault(require("./core/proxy/RhineVar"));
 exports.RhineVar = RhineVar_1.default;
-const DirectPackage_1 = __importDefault(require("./core/proxy/DirectPackage"));
-exports.DirectPackage = DirectPackage_1.default;
+const DirectKey_1 = __importDefault(require("./core/proxy/DirectKey"));
+exports.DirectPackage = DirectKey_1.default;
 const WebsocketRhineConnector_1 = __importDefault(require("./core/connector/WebsocketRhineConnector"));
 exports.WebsocketRhineConnector = WebsocketRhineConnector_1.default;
 const useRhine_1 = __importDefault(require("./react/hooks/useRhine"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhine-var",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "description": "Variables that support multi-user collaboration and persistence, making collaboration and variable operations as simple as possible, with strict and well-defined type hints.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,8 +9,7 @@
     "build": "tsc",
     "watch": "tsc --watch",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "publish-github": "npm publish --scope=@RhineAI-Lab --registry=https://npm.pkg.github.com",
-    "publish-npmjs": "npm publish"
+    "publish": "npm publish"
   },
   "author": "RhineAI",
   "license": "Apache-2.0",