@rest-vir/define-service 0.17.1 → 0.18.0

package/dist/web-socket/overwrite-web-socket-methods.d.ts

@@ -4,7 +4,7 @@ import { type HasRequiredKeys } from 'type-fest';
 import { type NoParam } from '../util/no-param.js';
 import { type BaseSearchParams } from '../util/search-params.js';
 import { type CommonWebSocket, type CommonWebSocketEventMap } from './common-web-socket.js';
-import { type WebSocketDefinition } from './web-socket-definition.js';
+import { type GenericWebSocketDefinition, type WebSocketDefinition } from './web-socket-definition.js';
 /**
  * Location of the WebSocket in question: on a client connecting to a WebSocket host or on the host
  * that's accepting WebSocket connections.
@@ -171,12 +171,12 @@ export type ClientWebSocket<WebSocketToConnect extends Readonly<SelectFrom<WebSo
  * @category Package : @rest-vir/define-service
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
-export type WebSocketListenerParams<EventName extends keyof CommonWebSocketEventMap, WebSocketToConnect extends Readonly<SelectFrom<WebSocketDefinition, {
+export type WebSocketListenerParams<EventName extends keyof CommonWebSocketEventMap, WebSocketToConnect extends Readonly<SelectFrom<GenericWebSocketDefinition, {
     MessageFromClientType: true;
     MessageFromHostType: true;
     SearchParamsType: true;
 }>> | NoParam, MessageSource extends WebSocketLocation, WebSocketClass extends CommonWebSocket> = {
-    webSocketDefinition: WebSocketToConnect extends NoParam ? Readonly<Overwrite<WebSocketDefinition, 
+    webSocketDefinition: WebSocketToConnect extends NoParam ? Readonly<Overwrite<GenericWebSocketDefinition, 
     /**
      * This `Overwrite` is needed so that
      * `CollapsedConnectWebSocketParams<ACTUAL_SOCKET>` can be assigned to
@@ -204,7 +204,7 @@ export type WebSocketListenerParams<EventName extends keyof CommonWebSocketEvent
  * @category Package : @rest-vir/define-service
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
-export type ConnectWebSocketListeners<WebSocketToConnect extends Readonly<SelectFrom<WebSocketDefinition, {
+export type ConnectWebSocketListeners<WebSocketToConnect extends Readonly<SelectFrom<GenericWebSocketDefinition, {
     MessageFromClientType: true;
     MessageFromHostType: true;
     SearchParamsType: true;
@@ -218,7 +218,7 @@ export type ConnectWebSocketListeners<WebSocketToConnect extends Readonly<Select
  * @category Package : @rest-vir/define-service
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
-export type WebSocketListener<EventName extends keyof CommonWebSocketEventMap, WebSocketToConnect extends Readonly<SelectFrom<WebSocketDefinition, {
+export type WebSocketListener<EventName extends keyof CommonWebSocketEventMap, WebSocketToConnect extends Readonly<SelectFrom<GenericWebSocketDefinition, {
     MessageFromClientType: true;
     MessageFromHostType: true;
     SearchParamsType: true;

package/dist/web-socket/web-socket-definition.d.ts

@@ -5,7 +5,6 @@ import { type EndpointPathBase } from '../endpoint/endpoint-path.js';
 import { type MinimalService } from '../service/minimal-service.js';
 import { type NoParam } from '../util/no-param.js';
 import { type OriginRequirement } from '../util/origin.js';
-import { type BaseSearchParams } from '../util/search-params.js';
 /**
  * Initialization for a WebSocket within a service definition..
  *
@@ -89,7 +88,7 @@ export type WithFinalWebSocketProps<Init, WebSocketPath extends EndpointPathBase
     protocolsShape: 'protocolsShape' extends keyof Init ? undefined extends Init['protocolsShape'] ? undefined : ShapeDefinition<Init['protocolsShape'], true> | undefined : undefined;
     ProtocolsType: undefined extends Init['protocolsShape'] ? string[] : ShapeToRuntimeType<ShapeDefinition<Init['protocolsShape'], true>, false, true>;
     searchParamsShape: 'searchParamsShape' extends keyof Init ? undefined extends Init['searchParamsShape'] ? undefined : ShapeDefinition<Init['searchParamsShape'], true> | undefined : undefined;
-    SearchParamsType: IsEqual<Init['searchParamsShape'], undefined> extends true ? BaseSearchParams : ShapeToRuntimeType<ShapeDefinition<Init['searchParamsShape'], true>, false, true>;
+    SearchParamsType: 'searchParamsShape' extends keyof Init ? ShapeToRuntimeType<ShapeDefinition<Init['searchParamsShape'], true>, false, true> : undefined;
     customProps: 'customProps' extends keyof Init ? Init['customProps'] : undefined;
 }> : never) & {
     path: WebSocketPath;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/define-service",
-    "version": "0.17.1",
+    "version": "0.18.0",
     "description": "Define an connect to a declarative and type safe REST and WebSocket service.",
     "keywords": [
         "rest",