@colyseus/schema 3.0.0-alpha.0 → 3.0.0-alpha.2

package/src/encoder/ChangeTree.ts

@@ -39,8 +39,6 @@ export class Root {
     changes = new Map<ChangeTree, Map<number, OPERATION>>();
     filteredChanges = new Map<ChangeTree, Map<number, OPERATION>>();
 
-    views: StateView[] = [];
-
     getNextUniqueId() {
         return this.nextUniqueId++;
     }

package/src/encoder/Encoder.ts

@@ -5,11 +5,10 @@ import { $changes, $encoder, $filter } from "../types/symbols";
 import * as encode from "../encoding/encode";
 import type { Iterator } from "../encoding/decode";
 
-import { OPERATION, SWITCH_TO_STRUCTURE, TYPE_ID } from '../encoding/spec';
+import { SWITCH_TO_STRUCTURE, TYPE_ID } from '../encoding/spec';
 import { Root } from "./ChangeTree";
 import { getNextPowerOf2 } from "../utils";
-import { StateView } from "./StateView";
-import { Metadata } from "../Metadata";
+import type { StateView } from "./StateView";
 
 export class Encoder<T extends Schema = any> {
     static BUFFER_SIZE = 8 * 1024;// 8KB
@@ -18,7 +17,7 @@ export class Encoder<T extends Schema = any> {
     context: TypeContext;
     state: T;
 
-    $root: Root;
+    root: Root;
 
     constructor(root: T) {
         this.setRoot(root);
@@ -36,20 +35,20 @@ export class Encoder<T extends Schema = any> {
     }
 
     protected setRoot(state: T) {
-        this.$root = new Root();
+        this.root = new Root();
         this.state = state;
-        state[$changes].setRoot(this.$root);
+        state[$changes].setRoot(this.root);
     }
 
     encode(
         it: Iterator = { offset: 0 },
         view?: StateView,
         bytes = this.sharedBuffer,
-        changeTrees = this.$root.changes
+        changeTrees = this.root.changes
     ): Buffer {
         const initialOffset = it.offset; // cache current offset in case we need to resize the buffer
 
-        const isEncodeAll = this.$root.allChanges === changeTrees;
+        const isEncodeAll = this.root.allChanges === changeTrees;
         const hasView = (view !== undefined);
         const rootChangeTree = this.state[$changes];
 
@@ -139,7 +138,7 @@ export class Encoder<T extends Schema = any> {
         //     console.log("->", item[0].refId, item[0].ref.toJSON());
         // });
 
-        return this.encode(it, undefined, this.sharedBuffer, this.$root.allChanges);
+        return this.encode(it, undefined, this.sharedBuffer, this.root.allChanges);
     }
 
     encodeAllView(view: StateView, sharedOffset: number, it: Iterator, bytes = this.sharedBuffer) {
@@ -149,7 +148,7 @@ export class Encoder<T extends Schema = any> {
         // this.debugAllFilteredChanges();
 
         // try to encode "filtered" changes
-        this.encode(it, view, bytes, this.$root.allFilteredChanges);
+        this.encode(it, view, bytes, this.root.allFilteredChanges);
 
         return Buffer.concat([
             bytes.slice(0, sharedOffset),
@@ -173,7 +172,7 @@ export class Encoder<T extends Schema = any> {
         const viewOffset = it.offset;
 
         // try to encode "filtered" changes
-        this.encode(it, view, bytes, this.$root.filteredChanges);
+        this.encode(it, view, bytes, this.root.filteredChanges);
 
         // encode visibility changes (add/remove for this view)
         const viewChangesIterator = view.changes.entries();
@@ -214,7 +213,7 @@ export class Encoder<T extends Schema = any> {
         ]);
     }
 
-    onEndEncode(changeTrees = this.$root.changes) {
+    onEndEncode(changeTrees = this.root.changes) {
         const changeTreesIterator = changeTrees.entries();
         for (const [changeTree, _] of changeTreesIterator) {
             changeTree.endEncode();
@@ -223,14 +222,14 @@ export class Encoder<T extends Schema = any> {
 
     discardChanges() {
         // discard shared changes
-        if (this.$root.changes.size > 0) {
-            this.onEndEncode(this.$root.changes);
-            this.$root.changes.clear();
+        if (this.root.changes.size > 0) {
+            this.onEndEncode(this.root.changes);
+            this.root.changes.clear();
         }
         // discard filtered changes
-        if (this.$root.filteredChanges.size > 0) {
-            this.onEndEncode(this.$root.filteredChanges);
-            this.$root.filteredChanges.clear();
+        if (this.root.filteredChanges.size > 0) {
+            this.onEndEncode(this.root.filteredChanges);
+            this.root.filteredChanges.clear();
         }
     }
 

package/src/encoder/StateView.ts

@@ -3,6 +3,10 @@ import { $changes } from "../types/symbols";
 import { DEFAULT_VIEW_TAG } from "../annotations";
 import { OPERATION } from "../encoding/spec";
 import { Metadata } from "../Metadata";
+import type { Schema } from "../Schema";
+
+export function createView(root: Schema) {
+}
 
 export class StateView {
     /**

package/src/encoding/encode.ts

@@ -22,6 +22,9 @@
  */
 
 import type { TextEncoder } from "util";
+import type { Iterator } from "./decode";
+
+export type BufferLike = number[] | ArrayBufferLike;
 
 /**
  * msgpack implementation highly based on notepack.io
@@ -32,7 +35,7 @@ let textEncoder: TextEncoder;
 // @ts-ignore
 try { textEncoder = new TextEncoder(); } catch (e) { }
 
-function utf8Length(str) {
+export function utf8Length(str) {
   var c = 0, length = 0;
   for (var i = 0, l = str.length; i < l; i++) {
     c = str.charCodeAt(i);
@@ -80,32 +83,32 @@ export function utf8Write(view, str, it) {
   }
 }
 
-export function int8(bytes, value, it) {
+export function int8(bytes: BufferLike, value: number, it: Iterator) {
     bytes[it.offset++] = value & 255;
 };
 
-export function uint8(bytes, value, it) {
+export function uint8(bytes: BufferLike, value: number, it: Iterator) {
     bytes[it.offset++] = value & 255;
 };
 
-export function int16(bytes, value, it) {
+export function int16(bytes: BufferLike, value: number, it: Iterator) {
     bytes[it.offset++] = value & 255;
     bytes[it.offset++] = (value >> 8) & 255;
 };
 
-export function uint16(bytes, value, it) {
+export function uint16(bytes: BufferLike, value: number, it: Iterator) {
     bytes[it.offset++] = value & 255;
     bytes[it.offset++] = (value >> 8) & 255;
 };
 
-export function int32(bytes, value, it) {
+export function int32(bytes: BufferLike, value: number, it: Iterator) {
   bytes[it.offset++] = value & 255;
   bytes[it.offset++] = (value >> 8) & 255;
   bytes[it.offset++] = (value >> 16) & 255;
   bytes[it.offset++] = (value >> 24) & 255;
 };
 
-export function uint32(bytes, value, it) {
+export function uint32(bytes: BufferLike, value: number, it: Iterator) {
   const b4 = value >> 24;
   const b3 = value >> 16;
   const b2 = value >> 8;
@@ -116,25 +119,25 @@ export function uint32(bytes, value, it) {
   bytes[it.offset++] = b4 & 255;
 };
 
-export function int64(bytes, value, it) {
+export function int64(bytes: BufferLike, value: number, it: Iterator) {
   const high = Math.floor(value / Math.pow(2, 32));
   const low = value >>> 0;
   uint32(bytes, low, it);
   uint32(bytes, high, it);
 };
 
-export function uint64(bytes, value, it) {
+export function uint64(bytes: BufferLike, value: number, it: Iterator) {
   const high = (value / Math.pow(2, 32)) >> 0;
   const low = value >>> 0;
   uint32(bytes, low, it);
   uint32(bytes, high, it);
 };
 
-export function float32(bytes, value, it) {
+export function float32(bytes: BufferLike, value: number, it: Iterator) {
   writeFloat32(bytes, value, it);
 }
 
-export function float64(bytes, value, it) {
+export function float64(bytes: BufferLike, value: number, it: Iterator) {
   writeFloat64(bytes, value, it);
 }
 
@@ -144,22 +147,22 @@ const _int32 = new Int32Array(2);
 const _float32 = new Float32Array(_int32.buffer);
 const _float64 = new Float64Array(_int32.buffer);
 
-export function writeFloat32(bytes, value, it) {
+export function writeFloat32(bytes: BufferLike, value: number, it: Iterator) {
   _float32[0] = value;
   int32(bytes, _int32[0], it);
 };
 
-export function writeFloat64(bytes, value, it) {
+export function writeFloat64(bytes: BufferLike, value: number, it: Iterator) {
   _float64[0] = value;
   int32(bytes, _int32[_isLittleEndian ? 0 : 1], it);
   int32(bytes, _int32[_isLittleEndian ? 1 : 0], it);
 };
 
-export function boolean(bytes, value, it) {
+export function boolean(bytes: BufferLike, value: number, it: Iterator) {
   bytes[it.offset++] = value ? 1 : 0; // uint8
 };
 
-export function string(bytes: Buffer, value, it) {
+export function string(bytes: BufferLike, value: string, it: Iterator) {
   // encode `null` strings as empty.
   if (!value) { value = ""; }
 
@@ -198,7 +201,7 @@ export function string(bytes: Buffer, value, it) {
   return size + length;
 }
 
-export function number(bytes, value, it) {
+export function number(bytes: BufferLike, value: number, it: Iterator) {
   if (isNaN(value)) {
     return number(bytes, 0, it);