oc-server 1.1.9 → 1.1.10

package/dist/Server.d.ts

@@ -1,7 +1,4 @@
-import { DataContext, DataProvider } from './types';
-type Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
+import { Prettify, ToJson, DataContext, DataProvider } from './types';
 export type ServerContext<E = {
     name: string;
 }, P = any, S = any> = Omit<DataContext<any, E, P, S>, 'params' | 'action' | 'setEmptyResponse'>;
@@ -35,7 +32,7 @@ export type RegisteredServer = Register extends {
     server: infer TServer extends AnyServer;
 } ? TServer : AnyServer;
 export type GetMiddlewareInput<TServer extends AnyServer> = TServer extends HandledServer<any, any, any, any, any, infer I> ? I : any;
-type GetInitialData<TServer extends AnyServer> = TServer extends HandledServer<any, any, any, any, infer O> ? Exclude<O, undefined | null> : any;
+type GetInitialData<TServer extends AnyServer> = TServer extends HandledServer<any, any, any, any, infer O> ? Exclude<ToJson<O>, undefined | null> : any;
 export type InitialData = GetInitialData<RegisteredServer>;
 export type ComponentSettings = {
     id: string;

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export * from './Server';
 export * from './serverClient';
-export * from './types';
+export { DataProvider, Template, External, DataContext } from './types';

package/dist/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Server"), exports);
 __exportStar(require("./serverClient"), exports);
-__exportStar(require("./types"), exports);

package/dist/serverClient.d.ts

@@ -1,11 +1,9 @@
 import { AnyServer, RegisteredServer, Action, GetMiddlewareInput } from './Server';
-type Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
+import { Prettify, ToJson } from './types';
 type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N;
 type IsAny<T> = IfAny<T, true, never>;
 type InferInput<R> = R extends Action<infer I, any, any, any, any> ? I : any;
-type InferOutput<R> = R extends Action<any, infer O, any, any, any> ? O : never;
+type InferOutput<R> = R extends Action<any, infer O, any, any, any> ? ToJson<O> : never;
 type ServerClient<TServer extends AnyServer> = {
     readonly [Property in keyof TServer['actions']]: (input: Prettify<InferInput<TServer['actions'][Property]> & (IsAny<GetMiddlewareInput<TServer>> extends never ? GetMiddlewareInput<TServer> : {})>) => Promise<InferOutput<TServer['actions'][Property]>>;
 };

package/dist/types.d.ts

@@ -1,3 +1,10 @@
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+type JsonPrimitive = string | number | boolean | null;
+export type ToJson<T> = T extends Date | RegExp ? string : T extends Function ? never : T extends JsonPrimitive ? T : T extends Array<infer U> ? ToJson<U>[] : T extends object ? {
+    [K in keyof T]: ToJson<T[K]>;
+} : never;
 export interface AcceptLanguage {
     code: string;
     script?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-server",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",