fix: fix meta type to allow nested json (#788)

pluv-io · Oct 22, 2024 · 98d7585 · 98d7585
1 parent df66865
commit 98d7585
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.changeset/friendly-ghosts-drum.md b/.changeset/friendly-ghosts-drum.md
@@ -0,0 +1,6 @@
+---
+"@pluv/platform-cloudflare": patch
+"@pluv/platform-node": patch
+---
+
+Update `meta` type on platform contexts to allow for nested json types.
diff --git a/packages/platform-cloudflare/src/CloudflarePlatform.ts b/packages/platform-cloudflare/src/CloudflarePlatform.ts
@@ -6,26 +6,23 @@ import type {
 } from "@pluv/io";
 import { AbstractPlatform } from "@pluv/io";
 import { PersistenceCloudflareTransactionalStorage } from "@pluv/persistence-cloudflare-transactional-storage";
-import type { JsonPrimitive } from "@pluv/types";
+import type { Json } from "@pluv/types";
 import { CloudflareWebSocket } from "./CloudflareWebSocket";
 import { DEFAULT_REGISTRATION_MODE } from "./constants";
 
-export type CloudflarePlatformRoomContext<
-    TEnv extends Record<string, any>,
-    TMeta extends Record<string, JsonPrimitive>,
-> = {
+export type CloudflarePlatformRoomContext<TEnv extends Record<string, any>, TMeta extends Record<string, Json>> = {
     env: TEnv;
     state: DurableObjectState;
 } & (keyof TMeta extends never ? { meta?: undefined } : { meta: TMeta });
 
 export type CloudflarePlatformConfig<
     TEnv extends Record<string, any> = {},
-    TMeta extends Record<string, JsonPrimitive> = {},
+    TMeta extends Record<string, Json> = {},
 > = AbstractPlatformConfig<CloudflarePlatformRoomContext<TEnv, TMeta>> & { mode?: WebSocketRegistrationMode };
 
 export class CloudflarePlatform<
     TEnv extends Record<string, any> = {},
-    TMeta extends Record<string, JsonPrimitive> = {},
+    TMeta extends Record<string, Json> = {},
 > extends AbstractPlatform<
     CloudflareWebSocket,
     { env: TEnv; request: Request },

diff --git a/packages/platform-cloudflare/src/platformCloudflare.ts b/packages/platform-cloudflare/src/platformCloudflare.ts
@@ -1,11 +1,8 @@
-import type { JsonPrimitive } from "@pluv/types";
+import type { Json } from "@pluv/types";
 import type { CloudflarePlatformConfig } from "./CloudflarePlatform";
 import { CloudflarePlatform } from "./CloudflarePlatform";
 
-export const platformCloudflare = <
-    TEnv extends Record<string, any> = {},
-    TMeta extends Record<string, JsonPrimitive> = {},
->(
+export const platformCloudflare = <TEnv extends Record<string, any> = {}, TMeta extends Record<string, Json> = {}>(
     config: CloudflarePlatformConfig<TEnv, TMeta> = {},
 ): CloudflarePlatform<TEnv, TMeta> => {
     return new CloudflarePlatform<TEnv, TMeta>(config);

diff --git a/packages/platform-node/src/NodePlatform.ts b/packages/platform-node/src/NodePlatform.ts
@@ -7,23 +7,23 @@ import type {
     WebSocketSerializedState,
 } from "@pluv/io";
 import { AbstractPlatform } from "@pluv/io";
-import type { JsonPrimitive } from "@pluv/types";
+import type { Json } from "@pluv/types";
 import crypto from "node:crypto";
 import type { IncomingMessage } from "node:http";
 import { TextDecoder } from "node:util";
 import type { WebSocket } from "ws";
 import { NodeWebSocket } from "./NodeWebSocket";
 
-export type NodePlatformRoomContext<TMeta extends Record<string, JsonPrimitive>> = keyof TMeta extends never
+export type NodePlatformRoomContext<TMeta extends Record<string, Json>> = keyof TMeta extends never
     ? { meta?: undefined }
     : { meta: TMeta };
 
-export type NodePlatformConfig<TMeta extends Record<string, JsonPrimitive>> = { mode?: WebSocketRegistrationMode } & (
+export type NodePlatformConfig<TMeta extends Record<string, Json>> = { mode?: WebSocketRegistrationMode } & (
     | { persistence?: undefined; pubSub?: undefined }
     | { persistence: AbstractPersistence; pubSub: AbstractPubSub }
 ) & { context?: NodePlatformRoomContext<TMeta> };
 
-export class NodePlatform<TMeta extends Record<string, JsonPrimitive> = {}> extends AbstractPlatform<
+export class NodePlatform<TMeta extends Record<string, Json> = {}> extends AbstractPlatform<
     NodeWebSocket,
     { req: IncomingMessage },
     NodePlatformRoomContext<TMeta>

diff --git a/packages/platform-node/src/platformNode.ts b/packages/platform-node/src/platformNode.ts
@@ -1,8 +1,8 @@
-import type { JsonPrimitive } from "@pluv/types";
+import type { Json } from "@pluv/types";
 import type { NodePlatformConfig } from "./NodePlatform";
 import { NodePlatform } from "./NodePlatform";
 
-export const platformNode = <TMeta extends Record<string, JsonPrimitive> = {}>(
+export const platformNode = <TMeta extends Record<string, Json> = {}>(
     config: NodePlatformConfig<TMeta> = {},
 ): NodePlatform<TMeta> => {
     return new NodePlatform<TMeta>(config);