oc-server 2.0.6 → 2.1.0

package/dist/Server.d.ts

@@ -1,4 +1,4 @@
-import { Prettify, DataContext, DataProvider, ToPrettyJson } from './types';
+import { Prettify, DataContext, DataProvider, ToPrettyJson, IsAnyOrUnknown } from './types';
 export type ServerContext<E = {
     name: string;
 }, P = any, S = any> = Omit<DataContext<any, E, P, S>, 'params' | 'action' | 'setEmptyResponse'>;
@@ -46,7 +46,7 @@ interface ServerOptions<S extends boolean> {
 }
 export declare class Server<E = {
     name: string;
-}, P = unknown, A extends Record<string, AnyAction> = {}, InitialInput = any, InitialOutput = any, MiddlewareInput = any, MiddlewareOutput = any, Streaming extends boolean = false> {
+}, P = unknown, A extends Record<string, AnyAction> = {}, InitialInput = unknown, InitialOutput = unknown, MiddlewareInput = any, MiddlewareOutput = any, Streaming extends boolean = false> {
     private readonly _options;
     private _parameters;
     private _middleware;
@@ -74,7 +74,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, any, any, infer Streaming> ? Streaming extends true ? Exclude<O, undefined | null> : Exclude<ToPrettyJson<O>, undefined | null> : any;
+type GetInitialData<TServer extends AnyServer> = TServer extends HandledServer<any, any, any, any, infer O, any, any, infer Streaming> ? IsAnyOrUnknown<O> extends never ? Streaming extends true ? Exclude<O, undefined | null> : Exclude<ToPrettyJson<O>, undefined | null> : unknown : unknown;
 type GetHandlerParameters<TServer extends AnyServer> = TServer extends HandledServer<any, any, any, infer I, any, any, any, any> ? I : any;
 export type HandlerParameters = GetHandlerParameters<RegisteredServer>;
 export type InitialData = GetInitialData<RegisteredServer>;

package/dist/cli/cli.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cli = void 0;
+exports.cli = cli;
 const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const oc_1 = require("./oc");
@@ -64,4 +64,3 @@ function cli() {
         (0, server_1.createServer)({ template, port });
     }
 }
-exports.cli = cli;

package/dist/cli/get-mocked-plugins.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getMockedPlugins;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const readJsonSync = (path) => JSON.parse(fs_1.default.readFileSync(path, 'utf-8'));
@@ -76,4 +77,3 @@ function getMockedPlugins(componentsDir) {
     plugins = plugins.concat(registerDynamicMocks(ocJsonLocation, content.mocks.plugins.dynamic ?? {}));
     return plugins;
 }
-exports.default = getMockedPlugins;

package/dist/cli/oc.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FastifyRequest } from 'fastify';
 import { PluginMock } from './get-mocked-plugins';
 interface Package {

package/dist/cli/oc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContext = exports.parsePkg = void 0;
+exports.parsePkg = parsePkg;
+exports.getContext = getContext;
 function parsePkg(pkg) {
     const serverEntry = pkg.oc?.files?.data;
     let appEntry = pkg.oc?.files?.template?.src || '';
@@ -34,7 +35,6 @@ function parsePkg(pkg) {
         templateType,
     };
 }
-exports.parsePkg = parsePkg;
 function getContext(plugins, req, params, action) {
     const responseHeaders = {};
     const context = {
@@ -66,4 +66,3 @@ function getContext(plugins, req, params, action) {
     };
     return { context, responseHeaders };
 }
-exports.getContext = getContext;

package/dist/cli/server.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServer = void 0;
+exports.createServer = createServer;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_vm_1 = __importDefault(require("node:vm"));
@@ -161,4 +161,3 @@ async function createServer({ template, port, }) {
     await app.listen({ port: port });
     console.log(`Listening on: http://localhost:${port}`);
 }
-exports.createServer = createServer;

package/dist/serverClient.d.ts

@@ -1,11 +1,11 @@
 import { AnyServer, RegisteredServer, Action, GetMiddlewareInput } from './Server';
-import { IsAny, Prettify, ToPrettyJson } from './types';
+import { IsAnyOrUnknown, Prettify, ToPrettyJson } from './types';
 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> ? ToPrettyJson<O> : never;
 type IsEmptyObject<T> = keyof T extends never ? true : false;
 type ServerClient<TServer extends AnyServer> = {
-    readonly [Property in keyof TServer['actions']]: (...args: IsEmptyObject<Prettify<InferInput<TServer['actions'][Property]> & (IsAny<GetMiddlewareInput<TServer>> extends never ? GetMiddlewareInput<TServer> : {})>> extends true ? [] : [
-        Prettify<InferInput<TServer['actions'][Property]> & (IsAny<GetMiddlewareInput<TServer>> extends never ? GetMiddlewareInput<TServer> : {})>
+    readonly [Property in keyof TServer['actions']]: (...args: IsEmptyObject<Prettify<InferInput<TServer['actions'][Property]> & (IsAnyOrUnknown<GetMiddlewareInput<TServer>> extends never ? GetMiddlewareInput<TServer> : {})>> extends true ? [] : [
+        Prettify<InferInput<TServer['actions'][Property]> & (IsAnyOrUnknown<GetMiddlewareInput<TServer>> extends never ? GetMiddlewareInput<TServer> : {})>
     ]) => Promise<InferOutput<TServer['actions'][Property]>>;
 };
 export declare const serverClient: ServerClient<RegisteredServer>;

package/dist/types.d.ts

@@ -46,6 +46,6 @@ export type DataContext<T = any, E = Env, P = any, S = unknown> = {
 } : {});
 type Callback<D, E = Error> = (error: E | null, data?: D) => void;
 export type DataProvider<Parameters = any, Return = any, Environment = Env> = (context: DataContext<Parameters, Environment>, callback: Callback<Return>) => void;
-type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N;
-export type IsAny<T> = IfAny<T, true, never>;
+type IfUnknown<T, Y, N> = [unknown] extends [T] ? [T] extends [unknown] ? Exclude<unknown, T> extends never ? Y : N : N : N;
+export type IsAnyOrUnknown<T> = IfUnknown<T, true, never>;
 export {};

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "oc-server",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "dist/cli/index.js",
-  "scripts": {
-    "build": "tsc",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
-  },
   "keywords": [
     "oc",
     "opencomponents"
@@ -25,5 +21,9 @@
     "@fastify/express": "^3.0.0",
     "fastify": "^4.28.1",
     "oc-client-browser": "^1.8.0"
+  },
+  "scripts": {
+    "build": "tsc",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
-}
+}