@rest-vir/define-service 1.3.2 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,5 @@
1
1
  import { type RequiredKeysOf, type SelectFrom } from '@augment-vir/common';
2
+ import { type BaseSearchParams } from '@rest-vir/define-service';
2
3
  import { type ConstructPathParams } from '../endpoint/endpoint-path.js';
3
4
  import { type NoParam } from '../util/no-param.js';
4
5
  import { type CommonWebSocket } from '../web-socket/common-web-socket.js';
@@ -55,9 +56,9 @@ export type ConnectWebSocketParams<WebSocketToConnect extends Readonly<SelectFro
55
56
  } : {
56
57
  protocols: WebSocketToConnect['ProtocolsType'];
57
58
  }) & (WebSocketToConnect['searchParamsShape'] extends undefined ? {
58
- searchParams?: never;
59
+ searchParams?: BaseSearchParams | undefined;
59
60
  } : {
60
- searchParams: WebSocketToConnect['SearchParamsType'];
61
+ searchParams: WebSocketToConnect['SearchParamsType'] & BaseSearchParams;
61
62
  });
62
63
  /**
63
64
  * Collapsed version of {@link ConnectWebSocketParams} for {@link connectWebSocket} that only
@@ -45,9 +45,9 @@ export type FetchEndpointParams<EndpointToFetch extends SelectFrom<EndpointDefin
45
45
  responseDataShape: true;
46
46
  methods: true;
47
47
  }>, AllowFetchMock extends boolean = true> = EndpointToFetch extends EndpointDefinition ? Readonly<ConstructPathParams<EndpointToFetch['path']> & (EndpointToFetch['SearchParamsType'] extends undefined ? {
48
- searchParams?: never;
48
+ searchParams?: BaseSearchParams | undefined;
49
49
  } : {
50
- searchParams: EndpointToFetch['SearchParamsType'];
50
+ searchParams: EndpointToFetch['SearchParamsType'] & BaseSearchParams;
51
51
  }) & (EndpointExecutorData<EndpointToFetch>['request'] extends undefined ? {
52
52
  /**
53
53
  * This endpoint does not accept any request data, so there is none to be
@@ -87,7 +87,7 @@ export type WithFinalWebSocketProps<Init, WebSocketPath extends EndpointPathBase
87
87
  MessageFromHostType: Init['messageFromHostShape'] extends NoParam ? any : undefined extends Init['messageFromHostShape'] ? undefined : ShapeInitType<Init['messageFromHostShape']>;
88
88
  protocolsShape: 'protocolsShape' extends keyof Init ? undefined extends Init['protocolsShape'] ? undefined : Shape<Init['protocolsShape']> | undefined : undefined;
89
89
  ProtocolsType: undefined extends Init['protocolsShape'] ? string[] : ShapeInitType<Init['protocolsShape']>;
90
- searchParamsShape: 'searchParamsShape' extends keyof Init ? undefined extends Init['searchParamsShape'] ? undefined : Shape<Init['searchParamsShape']> | undefined : undefined;
90
+ searchParamsShape: 'searchParamsShape' extends keyof Init ? Shape<Init['searchParamsShape']> | undefined : undefined;
91
91
  SearchParamsType: 'searchParamsShape' extends keyof Init ? ShapeInitType<Init['searchParamsShape']> : undefined;
92
92
  customProps: 'customProps' extends keyof Init ? Init['customProps'] : undefined;
93
93
  }> : never) & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rest-vir/define-service",
3
- "version": "1.3.2",
3
+ "version": "1.3.4",
4
4
  "description": "Define an connect to a declarative and type safe REST and WebSocket service.",
5
5
  "keywords": [
6
6
  "rest",
@@ -40,14 +40,14 @@
40
40
  "test:update": "npm test update"
41
41
  },
42
42
  "dependencies": {
43
- "@augment-vir/assert": "^31.48.0",
44
- "@augment-vir/common": "^31.48.0",
43
+ "@augment-vir/assert": "^31.51.1",
44
+ "@augment-vir/common": "^31.51.1",
45
45
  "date-vir": "^8.0.0",
46
46
  "type-fest": "^5.2.0",
47
47
  "url-vir": "^2.1.6"
48
48
  },
49
49
  "devDependencies": {
50
- "@augment-vir/test": "^31.48.0",
50
+ "@augment-vir/test": "^31.51.1",
51
51
  "@web/dev-server-esbuild": "^1.0.4",
52
52
  "@web/test-runner": "^0.20.2",
53
53
  "@web/test-runner-commands": "^0.9.0",