@pikku/core 0.6.10 → 0.6.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## 0.6
 
+## 0.6.11
+
+### Patch Changes
+
+- 7859b28: breaking: changing overrides for addRoute to wrap instead due to random conflict override errors
+- 269a532: fix: fixing some typing issues
+
 ## 0.6.10
 
 ### Patch Changes

package/dist/channel/channel-runner.d.ts

@@ -16,7 +16,7 @@ export declare const setChannelsMeta: (_channelsMeta: ChannelsMeta) => void;
 export declare const getMatchingChannelConfig: (request: string) => {
     matchedPath: import("path-to-regexp").MatchResult<Partial<Record<string, string | string[]>>>;
     params: Partial<Record<string, string | string[]>>;
-    channelConfig: CoreAPIChannel<any, string, import("./channel.types.js").CoreChannelConnection<any, unknown, import("../types/core.types.js").CoreServices, unknown>, import("./channel.types.js").CoreChannelConnection<any, unknown, import("../types/core.types.js").CoreServices, unknown>, import("./channel.types.js").CoreChannelMessage<unknown, unknown, unknown, import("../types/core.types.js").CoreServices, unknown>, import("./channel.types.js").CoreChannelMessage<unknown, unknown, unknown, import("../types/core.types.js").CoreServices, unknown>, import("../index.js").CoreAPIPermission<any>>;
+    channelConfig: CoreAPIChannel<any, string, import("./channel.types.js").CoreChannelConnection<any, unknown, import("../types/core.types.js").CoreServices, CoreUserSession>, import("./channel.types.js").CoreChannelDisconnection<any, import("../types/core.types.js").CoreServices, CoreUserSession>, import("./channel.types.js").CoreChannelMessage<unknown, unknown, unknown, import("../types/core.types.js").CoreServices, CoreUserSession>, import("./channel.types.js").CoreChannelMessage<unknown, unknown, unknown, import("../types/core.types.js").CoreServices, CoreUserSession>, import("../index.js").CoreAPIPermission<any>>;
     schemaName: string | null | undefined;
 } | null;
 export declare const openChannel: ({ route, singletonServices, skipUserSession, coerceToArray, http, }: Pick<CoreAPIChannel<unknown, string>, "route"> & Omit<RunChannelParams<unknown>, "response" | "request"> & RunChannelOptions) => Promise<{

package/dist/channel/channel.types.d.ts

@@ -2,7 +2,7 @@ import { PikkuError } from '../errors/error-handler.js';
 import { HTTPFunctionMetaInputTypes, PikkuHTTP } from '../http/http-routes.types.js';
 import { PikkuHTTPAbstractRequest } from '../http/pikku-http-abstract-request.js';
 import { PikkuHTTPAbstractResponse } from '../http/pikku-http-abstract-response.js';
-import { APIDocs, CoreServices, CoreSingletonServices, CoreUserSession, CreateSessionServices, MakeRequired } from '../types/core.types.js';
+import { APIDocs, CoreServices, CoreSingletonServices, CoreUserSession, CreateSessionServices } from '../types/core.types.js';
 import { CoreAPIPermission } from '../types/functions.types.js';
 import { PikkuRequest } from '../pikku-request.js';
 import { PikkuResponse } from '../pikku-response.js';
@@ -15,7 +15,7 @@ export type RunChannelOptions = Partial<{
 }>;
 export type RunChannelParams<ChannelData> = {
     channelId: string;
-    singletonServices: MakeRequired<CoreSingletonServices, 'eventHub'>;
+    singletonServices: CoreSingletonServices;
     request?: PikkuRequest<ChannelData> | PikkuHTTPAbstractRequest<ChannelData>;
     response?: PikkuResponse | PikkuHTTPAbstractResponse;
     http?: PikkuHTTP;
@@ -43,8 +43,8 @@ export interface ChannelMeta {
     docs?: APIDocs;
 }
 export type ChannelsMeta = ChannelMeta[];
-export type CoreChannelConnection<ChannelData, Out = unknown, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: MakeRequired<Services, 'eventHub'>, channel: PikkuChannel<Session, ChannelData, Out>) => Promise<void>;
-export type CoreChannelDisconnection<ChannelData, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: MakeRequired<Services, 'eventHub'>, channel: PikkuChannel<Session, ChannelData, never>) => Promise<void>;
+export type CoreChannelConnection<ChannelData, Out = unknown, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: Services, channel: PikkuChannel<Session, ChannelData, Out>) => Promise<void>;
+export type CoreChannelDisconnection<ChannelData, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: Services, channel: PikkuChannel<Session, ChannelData, never>) => Promise<void>;
 /**
  * Represents a core channel function that performs an operation using core services and a user session.
  *
@@ -52,12 +52,12 @@ export type CoreChannelDisconnection<ChannelData, Services extends CoreServices
  * @template Services - The services type, defaults to `CoreServices`.
  * @template Session - The session type, defaults to `CoreUserSession`.
  */
-export type CoreChannelMessage<In, Out, ChannelData, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: MakeRequired<Services, 'eventHub'>, channel: PikkuChannel<Session, ChannelData, Out>, data: In) => Promise<void | Out>;
+export type CoreChannelMessage<In, Out, ChannelData, Services extends CoreServices = CoreServices, Session extends CoreUserSession = CoreUserSession> = (services: Services, channel: PikkuChannel<Session, ChannelData, Out>, data: In) => Promise<void | Out>;
 export type CoreAPIChannelMessage<ChannelFunctionMessage = CoreChannelMessage<unknown, unknown, unknown>> = {
     func: ChannelFunctionMessage;
     route: string;
 };
-export type CoreAPIChannel<ChannelData, Channel extends string, ChannelFunctionConnection = CoreChannelConnection<ChannelData>, ChannelFunctionDisconnection = CoreChannelConnection<ChannelData>, ChannelFunctionDefaultMessage = CoreChannelMessage<unknown, unknown, unknown>, ChannelFunctionMessageRoute = CoreChannelMessage<unknown, unknown, unknown>, APIPermission = CoreAPIPermission<ChannelData>> = {
+export type CoreAPIChannel<ChannelData, Channel extends string, ChannelFunctionConnection = CoreChannelConnection<ChannelData>, ChannelFunctionDisconnection = CoreChannelDisconnection<ChannelData>, ChannelFunctionDefaultMessage = CoreChannelMessage<unknown, unknown, unknown>, ChannelFunctionMessageRoute = CoreChannelMessage<unknown, unknown, unknown>, APIPermission = CoreAPIPermission<ChannelData>> = {
     name: string;
     route: Channel;
     onConnect?: ChannelFunctionConnection;

package/dist/http/http-route-runner.d.ts

@@ -21,7 +21,7 @@ export declare const getRoutes: () => {
     routesMeta: HTTPRoutesMeta;
 };
 export declare const getUserSession: <UserSession extends CoreUserSession>(httpSessionService: HTTPSessionService<UserSession> | undefined, auth: boolean, request: PikkuHTTPAbstractRequest) => Promise<CoreUserSession | undefined>;
-export declare const loadUserSession: (skipUserSession: boolean, requiresSession: boolean, http: PikkuHTTP | undefined, matchedPath: any, route: CoreHTTPFunctionRoute<unknown, unknown, any> | CoreAPIChannel<unknown, any>, logger: Logger, httpSessionService: HTTPSessionService | undefined) => Promise<unknown>;
+export declare const loadUserSession: (skipUserSession: boolean, requiresSession: boolean, http: PikkuHTTP | undefined, matchedPath: any, route: CoreHTTPFunctionRoute<unknown, unknown, any> | CoreAPIChannel<unknown, any>, logger: Logger, httpSessionService: HTTPSessionService | undefined) => Promise<CoreUserSession | undefined>;
 export declare const createHTTPInteraction: (request: PikkuRequest | undefined, response: PikkuResponse | undefined) => PikkuHTTP | undefined;
 export declare const handleError: (e: any, http: PikkuHTTP | undefined, trackerId: string, logger: Logger, logWarningsForStatusCodes: number[], respondWith404: boolean, bubbleError: boolean) => void;
 /**

package/dist/types/core.types.d.ts

@@ -47,11 +47,12 @@ export type CoreConfig<Config extends Record<string, unknown> = {}> = {
 /**
  * Represents a core user session, which can be extended for more specific session information.
  */
-export type CoreUserSession<UserSession = unknown> = UserSession;
+export interface CoreUserSession {
+}
 /**
  * Interface for core singleton services provided by Pikku.
  */
-export type CoreSingletonServices<Config extends CoreConfig = CoreConfig, UserSession extends CoreUserSession = CoreUserSession, UserServices extends Record<string, unknown> = {}> = {
+export interface CoreSingletonServices<Config extends CoreConfig = CoreConfig, UserSession extends CoreUserSession = CoreUserSession> {
     /** The http permission service used for authorization (optional). */
     enforceHTTPAccess?: enforceHTTPAccess;
     /** The channel permission service used by the application (optional). */
@@ -72,7 +73,7 @@ export type CoreSingletonServices<Config extends CoreConfig = CoreConfig, UserSe
     eventHub?: EventHubService<unknown>;
     /** SecretServce  */
     secretService?: SecretService;
-} & UserServices;
+}
 /**
  * Represents different forms of interaction within Pikku and the outside world.
  */