@colyseus/schema 4.0.18 → 4.0.19

package/build/types/HelperTypes.d.ts

@@ -65,9 +65,9 @@ export type NonFunctionNonPrimitivePropNames<T> = {
     [K in keyof T]: T[K] extends Function ? never : T[K] extends number | string | boolean ? never : K;
 }[keyof T];
 type ToJSONValue<U> = U extends Schema ? ToJSON<U> : PrimitiveStringToType<U>;
-export type ToJSON<T> = NonFunctionProps<{
-    [K in keyof T]: T[K] extends MapSchema<infer U> ? Record<string, ToJSONValue<U>> : T[K] extends Map<string, infer U> ? Record<string, ToJSONValue<U>> : T[K] extends ArraySchema<infer U> ? ToJSONValue<U>[] : T[K] extends SetSchema<infer U> ? ToJSONValue<U>[] : T[K] extends CollectionSchema<infer U> ? ToJSONValue<U>[] : T[K] extends Schema ? ToJSON<T[K]> : T[K];
-}>;
+export type ToJSON<T> = {
+    [K in keyof T as T[K] extends Function ? never : K]: T[K] extends MapSchema<infer U> ? Record<string, ToJSONValue<U>> : T[K] extends Map<string, infer U> ? Record<string, ToJSONValue<U>> : T[K] extends ArraySchema<infer U> ? ToJSONValue<U>[] : T[K] extends SetSchema<infer U> ? ToJSONValue<U>[] : T[K] extends CollectionSchema<infer U> ? ToJSONValue<U>[] : T[K] extends Schema ? ToJSON<T[K]> : T[K];
+};
 export type IsNever<T> = [T] extends [never] ? true : false;
 /**
  * Type helper for .assign() method - allows assigning values in a flexible way

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/schema",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "description": "Binary state serializer with delta encoding for games",
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
     "build": "tsc -p tsconfig.build.json && rollup -c rollup.config.mjs",
     "watch": "tsc -p tsconfig.build.json -w",
     "test": "tsx --tsconfig tsconfig.test.json ./node_modules/.bin/mocha test/*.test.ts test/**/*.test.ts",
+    "typecheck": "tsc -p tsconfig.test.json",
     "coverage": "c8 npm run test",
     "generate-test-1": "bin/schema-codegen test-external/PrimitiveTypes.ts --namespace SchemaTest.PrimitiveTypes --output ../colyseus-unity-sdk/Assets/Colyseus/Tests/Editor/ColyseusTests/Schema/PrimitiveTypes",
     "generate-test-2": "bin/schema-codegen test-external/ChildSchemaTypes.ts --namespace SchemaTest.ChildSchemaTypes --output ../colyseus-unity-sdk/Assets/Colyseus/Tests/Editor/ColyseusTests/Schema/ChildSchemaTypes",

package/src/Schema.ts

@@ -122,7 +122,7 @@ export class Schema<C = any> implements IRef {
      * @param jsonData JSON data to restore the instance from
      * @returns
      */
-    public restore<T extends Partial<this>>(jsonData: ToJSON<T>): this {
+    public restore(jsonData: ToJSON<this>): this {
         const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
 
         for (const fieldIndex in metadata) {
@@ -224,7 +224,7 @@ export class Schema<C = any> implements IRef {
         return cloned;
     }
 
-    toJSON (this: any): ToJSON<Partial<this>> {
+    toJSON (this: any): ToJSON<this> {
         const obj: any = {};
         const metadata = this.constructor[Symbol.metadata];
         for (const index in metadata) {

package/src/types/HelperTypes.ts

@@ -95,8 +95,8 @@ export type NonFunctionNonPrimitivePropNames<T> = {
 // Helper to recursively convert Schema instances to their JSON representation
 type ToJSONValue<U> = U extends Schema ? ToJSON<U> : PrimitiveStringToType<U>;
 
-export type ToJSON<T> = NonFunctionProps<{
-    [K in keyof T]:
+export type ToJSON<T> = {
+    [K in keyof T as T[K] extends Function ? never : K]:
         T[K] extends MapSchema<infer U> ? Record<string, ToJSONValue<U>>
         : T[K] extends Map<string, infer U> ? Record<string, ToJSONValue<U>>
         : T[K] extends ArraySchema<infer U> ? ToJSONValue<U>[]
@@ -104,7 +104,7 @@ export type ToJSON<T> = NonFunctionProps<{
         : T[K] extends CollectionSchema<infer U> ? ToJSONValue<U>[]
         : T[K] extends Schema ? ToJSON<T[K]>
         : T[K]
-}>;
+};
 
 // Helper type to check if T is exactly 'never' (meaning no InitProps was provided)
 export type IsNever<T> = [T] extends [never] ? true : false;