@rvoh/psychic 0.34.5 → 0.35.0

package/dist/cjs/src/bin/index.js

@@ -71,7 +71,7 @@ class PsychicBin {
         await PsychicBin.syncOpenapiJson();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let output = {};
-        for (const hook of psychicApp.specialHooks.sync) {
+        for (const hook of psychicApp.specialHooks.cliSync) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const res = await hook();
             if ((0, typechecks_js_1.isObject)(res)) {

package/dist/cjs/src/generate/helpers/reduxBindings/writeApiFile.js

@@ -65,7 +65,7 @@ export const ${apiImport} = createApi({
   keepUnusedDataFor: 0,
 
   baseQuery: fetchBaseQuery({
-    baseUrl: baseURL(),
+    baseUrl: baseUrl(),
     credentials: 'include',
 
     // we recommend that you use a function like this for preparing

package/dist/cjs/src/openapi-renderer/endpoint.js

@@ -15,6 +15,8 @@ const openapiRoute_js_1 = __importDefault(require("./helpers/openapiRoute.js"));
 const primitiveOpenapiStatementToOpenapi_js_1 = __importDefault(require("./helpers/primitiveOpenapiStatementToOpenapi.js"));
 const serializer_js_1 = __importDefault(require("./serializer.js"));
 const FailedToLookupSerializerForEndpoint_js_1 = __importDefault(require("../error/openapi/FailedToLookupSerializerForEndpoint.js"));
+const pageParamOpenapiProperty_js_1 = __importDefault(require("./helpers/pageParamOpenapiProperty.js"));
+const safelyAttachPaginationParamsToBodySegment_js_1 = __importDefault(require("./helpers/safelyAttachPaginationParamsToBodySegment.js"));
 class OpenapiEndpointRenderer {
     dreamsOrSerializers;
     controllerClass;
@@ -299,7 +301,7 @@ class OpenapiEndpointRenderer {
      * "parameters" field for a single endpoint.
      */
     queryArray(openapiName) {
-        return (Object.keys(this.query || {}).map((queryName) => {
+        const queryParams = Object.keys(this.query || {}).map((queryName) => {
             const queryParam = this.query[queryName];
             let output = {
                 in: 'query',
@@ -325,7 +327,21 @@ class OpenapiEndpointRenderer {
                 };
             }
             return output;
-        }) || []);
+        }) || [];
+        const paginationName = this.paginate?.query;
+        if (paginationName) {
+            queryParams.push({
+                in: 'query',
+                required: false,
+                name: paginationName,
+                description: 'Page number',
+                allowReserved: true,
+                schema: {
+                    type: 'string',
+                },
+            });
+        }
+        return queryParams;
     }
     /**
      * @internal
@@ -335,17 +351,22 @@ class OpenapiEndpointRenderer {
     computedRequestBody(openapiName, processedSchemas, routes) {
         const method = this.computedMethod(routes);
         if (this.requestBody === null)
-            return undefined;
+            return this.defaultRequestBody();
         const httpMethodsThatAllowBody = ['post', 'patch', 'put'];
         if (!httpMethodsThatAllowBody.includes(method))
-            return undefined;
+            return this.defaultRequestBody();
         if (this.shouldAutogenerateBody()) {
             return this.generateRequestBodyForModel(openapiName, processedSchemas);
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const schema = this.recursivelyParseBody(openapiName, this.requestBody, processedSchemas, {
+        let schema = this.recursivelyParseBody(openapiName, this.requestBody, processedSchemas, {
             target: 'request',
         });
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            schema = (0, safelyAttachPaginationParamsToBodySegment_js_1.default)(bodyPageParam, schema);
+        }
         if (!schema)
             return undefined;
         return {
@@ -357,6 +378,24 @@ class OpenapiEndpointRenderer {
             },
         };
     }
+    defaultRequestBody() {
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            return {
+                content: {
+                    'application/json': {
+                        schema: {
+                            type: 'object',
+                            properties: {
+                                [bodyPageParam]: (0, pageParamOpenapiProperty_js_1.default)(),
+                            },
+                        },
+                    },
+                },
+            };
+        }
+        return undefined;
+    }
     /**
      * @internal
      *
@@ -390,7 +429,7 @@ class OpenapiEndpointRenderer {
         const forDreamClass = this.requestBody?.for;
         const dreamClass = forDreamClass || this.getSingleDreamModelClass();
         if (!dreamClass)
-            return undefined;
+            return this.defaultRequestBody();
         let paramSafeColumns = dreamClass.paramSafeColumnsOrFallback();
         const only = this.requestBody?.only;
         if (only) {
@@ -541,12 +580,17 @@ class OpenapiEndpointRenderer {
                     }
             }
         }
+        let processedSchema = this.recursivelyParseBody(openapiName, paramsShape, processedSchemas, {
+            target: 'request',
+        });
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            processedSchema = (0, safelyAttachPaginationParamsToBodySegment_js_1.default)(bodyPageParam, processedSchema);
+        }
         return {
             content: {
                 'application/json': {
-                    schema: this.recursivelyParseBody(openapiName, paramsShape, processedSchemas, {
-                        target: 'request',
-                    }),
+                    schema: processedSchema,
                 },
             },
         };

package/dist/cjs/src/openapi-renderer/helpers/pageParamOpenapiProperty.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = openapiPageParamProperty;
+function openapiPageParamProperty() {
+    return {
+        type: 'integer',
+        description: 'Page number',
+    };
+}

package/dist/cjs/src/openapi-renderer/helpers/safelyAttachPaginationParamsToBodySegment.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = safelyAttachPaginationParamToRequestBodySegment;
+const pageParamOpenapiProperty_js_1 = __importDefault(require("./pageParamOpenapiProperty.js"));
+/**
+ * @internal
+ *
+ * Used to carefully bind implicit pagination params
+ * to the requestBody properties. It will not apply
+ * the pagination param unless the provided bodySegment
+ * is:
+ *
+ * a.) falsey (null, undefined, etc...)
+ * b.) an openapi object (must have { type: 'object'})
+ *
+ * If neither of these apply, it will simply return
+ * what was given to it, without any modifications
+ */
+function safelyAttachPaginationParamToRequestBodySegment(paramName, bodySegment) {
+    bodySegment ||= {
+        type: 'object',
+        properties: {},
+    };
+    if (bodySegment.type === 'object') {
+        ;
+        bodySegment.properties = {
+            ...bodySegment.properties,
+            [paramName]: (0, pageParamOpenapiProperty_js_1.default)(),
+        };
+    }
+    return bodySegment;
+}

package/dist/cjs/src/psychic-app/index.js

@@ -220,19 +220,10 @@ Try setting it to something valid, like:
     get inflections() {
         return this._inflections;
     }
-    _bootHooks = {
-        boot: [],
-        load: [],
-        'load:dev': [],
-        'load:test': [],
-        'load:prod': [],
-    };
-    get bootHooks() {
-        return this._bootHooks;
-    }
     _specialHooks = {
-        sync: [],
-        serverInit: [],
+        cliSync: [],
+        serverInitBeforeMiddleware: [],
+        serverInitAfterMiddleware: [],
         serverInitAfterRoutes: [],
         serverStart: [],
         serverError: [],
@@ -297,18 +288,6 @@ Try setting it to something valid, like:
         if (this.booted && !force)
             return;
         // await new IntegrityChecker().check()
-        await this.runHooksFor('load');
-        switch (EnvInternal_js_1.default.nodeEnv) {
-            case 'development':
-                await this.runHooksFor('load:dev');
-                break;
-            case 'production':
-                await this.runHooksFor('load:prod');
-                break;
-            case 'test':
-                await this.runHooksFor('load:test');
-                break;
-        }
         await this.inflections?.();
         this.booted = true;
     }
@@ -320,8 +299,11 @@ Try setting it to something valid, like:
             case 'server:error':
                 this._specialHooks.serverError.push(cb);
                 break;
-            case 'server:init':
-                this._specialHooks.serverInit.push(cb);
+            case 'server:init:before-middleware':
+                this._specialHooks.serverInitBeforeMiddleware.push(cb);
+                break;
+            case 'server:init:after-middleware':
+                this._specialHooks.serverInitAfterMiddleware.push(cb);
                 break;
             case 'server:start':
                 this._specialHooks.serverStart.push(cb);
@@ -332,12 +314,10 @@ Try setting it to something valid, like:
             case 'server:init:after-routes':
                 this._specialHooks.serverInitAfterRoutes.push(cb);
                 break;
-            case 'sync':
+            case 'cli:sync':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                this._specialHooks['sync'].push(cb);
+                this._specialHooks['cliSync'].push(cb);
                 break;
-            default:
-                this.bootHooks[hookEventType].push(cb);
         }
     }
     set(option, unknown1, unknown2) {
@@ -429,11 +409,6 @@ Try setting it to something valid, like:
                 this.overrides['server:start'] = value;
         }
     }
-    async runHooksFor(hookEventType) {
-        for (const hook of this.bootHooks[hookEventType]) {
-            await hook(this);
-        }
-    }
 }
 exports.default = PsychicApp;
 exports.PsychicAppAllowedPackageManagersEnumValues = ['yarn', 'npm', 'pnpm'];

package/dist/cjs/src/server/index.js

@@ -73,7 +73,9 @@ class PsychicServer {
             });
             next();
         });
-        await this.config['runHooksFor']('boot');
+        for (const serverInitBeforeMiddlewareHook of this.config.specialHooks.serverInitBeforeMiddleware) {
+            await serverInitBeforeMiddlewareHook(this);
+        }
         this.initializeCors();
         this.initializeJSON();
         try {
@@ -87,8 +89,8 @@ class PsychicServer {
           ${error.message}
       `);
         }
-        for (const expressInitHook of this.config.specialHooks.serverInit) {
-            await expressInitHook(this);
+        for (const serverInitAfterMiddlewareHook of this.config.specialHooks.serverInitAfterMiddleware) {
+            await serverInitAfterMiddlewareHook(this);
         }
         this.initializeOpenapiValidation();
         await this.buildRoutes();

package/dist/esm/src/bin/index.js

@@ -43,7 +43,7 @@ export default class PsychicBin {
         await PsychicBin.syncOpenapiJson();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let output = {};
-        for (const hook of psychicApp.specialHooks.sync) {
+        for (const hook of psychicApp.specialHooks.cliSync) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const res = await hook();
             if (isObject(res)) {

package/dist/esm/src/generate/helpers/reduxBindings/writeApiFile.js

@@ -39,7 +39,7 @@ export const ${apiImport} = createApi({
   keepUnusedDataFor: 0,
 
   baseQuery: fetchBaseQuery({
-    baseUrl: baseURL(),
+    baseUrl: baseUrl(),
     credentials: 'include',
 
     // we recommend that you use a function like this for preparing

package/dist/esm/src/openapi-renderer/endpoint.js

@@ -9,6 +9,8 @@ import openapiRoute from './helpers/openapiRoute.js';
 import primitiveOpenapiStatementToOpenapi from './helpers/primitiveOpenapiStatementToOpenapi.js';
 import OpenapiSerializerRenderer from './serializer.js';
 import OpenApiFailedToLookupSerializerForEndpoint from '../error/openapi/FailedToLookupSerializerForEndpoint.js';
+import openapiPageParamProperty from './helpers/pageParamOpenapiProperty.js';
+import safelyAttachPaginationParamToRequestBodySegment from './helpers/safelyAttachPaginationParamsToBodySegment.js';
 export default class OpenapiEndpointRenderer {
     dreamsOrSerializers;
     controllerClass;
@@ -293,7 +295,7 @@ export default class OpenapiEndpointRenderer {
      * "parameters" field for a single endpoint.
      */
     queryArray(openapiName) {
-        return (Object.keys(this.query || {}).map((queryName) => {
+        const queryParams = Object.keys(this.query || {}).map((queryName) => {
             const queryParam = this.query[queryName];
             let output = {
                 in: 'query',
@@ -319,7 +321,21 @@ export default class OpenapiEndpointRenderer {
                 };
             }
             return output;
-        }) || []);
+        }) || [];
+        const paginationName = this.paginate?.query;
+        if (paginationName) {
+            queryParams.push({
+                in: 'query',
+                required: false,
+                name: paginationName,
+                description: 'Page number',
+                allowReserved: true,
+                schema: {
+                    type: 'string',
+                },
+            });
+        }
+        return queryParams;
     }
     /**
      * @internal
@@ -329,17 +345,22 @@ export default class OpenapiEndpointRenderer {
     computedRequestBody(openapiName, processedSchemas, routes) {
         const method = this.computedMethod(routes);
         if (this.requestBody === null)
-            return undefined;
+            return this.defaultRequestBody();
         const httpMethodsThatAllowBody = ['post', 'patch', 'put'];
         if (!httpMethodsThatAllowBody.includes(method))
-            return undefined;
+            return this.defaultRequestBody();
         if (this.shouldAutogenerateBody()) {
             return this.generateRequestBodyForModel(openapiName, processedSchemas);
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const schema = this.recursivelyParseBody(openapiName, this.requestBody, processedSchemas, {
+        let schema = this.recursivelyParseBody(openapiName, this.requestBody, processedSchemas, {
             target: 'request',
         });
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            schema = safelyAttachPaginationParamToRequestBodySegment(bodyPageParam, schema);
+        }
         if (!schema)
             return undefined;
         return {
@@ -351,6 +372,24 @@ export default class OpenapiEndpointRenderer {
             },
         };
     }
+    defaultRequestBody() {
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            return {
+                content: {
+                    'application/json': {
+                        schema: {
+                            type: 'object',
+                            properties: {
+                                [bodyPageParam]: openapiPageParamProperty(),
+                            },
+                        },
+                    },
+                },
+            };
+        }
+        return undefined;
+    }
     /**
      * @internal
      *
@@ -384,7 +423,7 @@ export default class OpenapiEndpointRenderer {
         const forDreamClass = this.requestBody?.for;
         const dreamClass = forDreamClass || this.getSingleDreamModelClass();
         if (!dreamClass)
-            return undefined;
+            return this.defaultRequestBody();
         let paramSafeColumns = dreamClass.paramSafeColumnsOrFallback();
         const only = this.requestBody?.only;
         if (only) {
@@ -535,12 +574,17 @@ export default class OpenapiEndpointRenderer {
                     }
             }
         }
+        let processedSchema = this.recursivelyParseBody(openapiName, paramsShape, processedSchemas, {
+            target: 'request',
+        });
+        const bodyPageParam = this.paginate?.body;
+        if (bodyPageParam) {
+            processedSchema = safelyAttachPaginationParamToRequestBodySegment(bodyPageParam, processedSchema);
+        }
         return {
             content: {
                 'application/json': {
-                    schema: this.recursivelyParseBody(openapiName, paramsShape, processedSchemas, {
-                        target: 'request',
-                    }),
+                    schema: processedSchema,
                 },
             },
         };

package/dist/esm/src/openapi-renderer/helpers/pageParamOpenapiProperty.js

@@ -0,0 +1,6 @@
+export default function openapiPageParamProperty() {
+    return {
+        type: 'integer',
+        description: 'Page number',
+    };
+}

package/dist/esm/src/openapi-renderer/helpers/safelyAttachPaginationParamsToBodySegment.js

@@ -0,0 +1,29 @@
+import openapiPageParamProperty from './pageParamOpenapiProperty.js';
+/**
+ * @internal
+ *
+ * Used to carefully bind implicit pagination params
+ * to the requestBody properties. It will not apply
+ * the pagination param unless the provided bodySegment
+ * is:
+ *
+ * a.) falsey (null, undefined, etc...)
+ * b.) an openapi object (must have { type: 'object'})
+ *
+ * If neither of these apply, it will simply return
+ * what was given to it, without any modifications
+ */
+export default function safelyAttachPaginationParamToRequestBodySegment(paramName, bodySegment) {
+    bodySegment ||= {
+        type: 'object',
+        properties: {},
+    };
+    if (bodySegment.type === 'object') {
+        ;
+        bodySegment.properties = {
+            ...bodySegment.properties,
+            [paramName]: openapiPageParamProperty(),
+        };
+    }
+    return bodySegment;
+}

package/dist/esm/src/psychic-app/index.js

@@ -191,19 +191,10 @@ Try setting it to something valid, like:
     get inflections() {
         return this._inflections;
     }
-    _bootHooks = {
-        boot: [],
-        load: [],
-        'load:dev': [],
-        'load:test': [],
-        'load:prod': [],
-    };
-    get bootHooks() {
-        return this._bootHooks;
-    }
     _specialHooks = {
-        sync: [],
-        serverInit: [],
+        cliSync: [],
+        serverInitBeforeMiddleware: [],
+        serverInitAfterMiddleware: [],
         serverInitAfterRoutes: [],
         serverStart: [],
         serverError: [],
@@ -268,18 +259,6 @@ Try setting it to something valid, like:
         if (this.booted && !force)
             return;
         // await new IntegrityChecker().check()
-        await this.runHooksFor('load');
-        switch (EnvInternal.nodeEnv) {
-            case 'development':
-                await this.runHooksFor('load:dev');
-                break;
-            case 'production':
-                await this.runHooksFor('load:prod');
-                break;
-            case 'test':
-                await this.runHooksFor('load:test');
-                break;
-        }
         await this.inflections?.();
         this.booted = true;
     }
@@ -291,8 +270,11 @@ Try setting it to something valid, like:
             case 'server:error':
                 this._specialHooks.serverError.push(cb);
                 break;
-            case 'server:init':
-                this._specialHooks.serverInit.push(cb);
+            case 'server:init:before-middleware':
+                this._specialHooks.serverInitBeforeMiddleware.push(cb);
+                break;
+            case 'server:init:after-middleware':
+                this._specialHooks.serverInitAfterMiddleware.push(cb);
                 break;
             case 'server:start':
                 this._specialHooks.serverStart.push(cb);
@@ -303,12 +285,10 @@ Try setting it to something valid, like:
             case 'server:init:after-routes':
                 this._specialHooks.serverInitAfterRoutes.push(cb);
                 break;
-            case 'sync':
+            case 'cli:sync':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                this._specialHooks['sync'].push(cb);
+                this._specialHooks['cliSync'].push(cb);
                 break;
-            default:
-                this.bootHooks[hookEventType].push(cb);
         }
     }
     set(option, unknown1, unknown2) {
@@ -400,10 +380,5 @@ Try setting it to something valid, like:
                 this.overrides['server:start'] = value;
         }
     }
-    async runHooksFor(hookEventType) {
-        for (const hook of this.bootHooks[hookEventType]) {
-            await hook(this);
-        }
-    }
 }
 export const PsychicAppAllowedPackageManagersEnumValues = ['yarn', 'npm', 'pnpm'];

package/dist/esm/src/server/index.js

@@ -45,7 +45,9 @@ export default class PsychicServer {
             });
             next();
         });
-        await this.config['runHooksFor']('boot');
+        for (const serverInitBeforeMiddlewareHook of this.config.specialHooks.serverInitBeforeMiddleware) {
+            await serverInitBeforeMiddlewareHook(this);
+        }
         this.initializeCors();
         this.initializeJSON();
         try {
@@ -59,8 +61,8 @@ export default class PsychicServer {
           ${error.message}
       `);
         }
-        for (const expressInitHook of this.config.specialHooks.serverInit) {
-            await expressInitHook(this);
+        for (const serverInitAfterMiddlewareHook of this.config.specialHooks.serverInitAfterMiddleware) {
+            await serverInitAfterMiddlewareHook(this);
         }
         this.initializeOpenapiValidation();
         await this.buildRoutes();

package/dist/types/src/openapi-renderer/endpoint.d.ts

@@ -137,6 +137,7 @@ export default class OpenapiEndpointRenderer<DreamsOrSerializersOrViewModels ext
      * Generates the requestBody portion of the endpoint
      */
     private computedRequestBody;
+    private defaultRequestBody;
     /**
      * @internal
      *
@@ -284,7 +285,7 @@ export interface OpenapiEndpointRendererOpts<I extends DreamSerializable | Dream
      * }
      * ```
      */
-    paginate?: boolean;
+    paginate?: boolean | CustomPaginationOpts;
     /**
      * specify path params. This is usually not necessary, since path params
      * are automatically computed for your endpoint by matching against the
@@ -489,6 +490,53 @@ export interface OpenapiEndpointRendererOpts<I extends DreamSerializable | Dream
      */
     omitDefaultResponses?: boolean;
 }
+export type CustomPaginationOpts = {
+    /**
+     * if provided, a query param will be added to the
+     * openapi spec with the name provided.
+     *
+     * ```ts
+     * @OpenAPI(Post, {
+     *   paginate: {
+     *     query: 'page'
+     *   },
+     * })
+     * public async index() {
+     *   this.ok(
+     *     await this.currentUser
+     *      .associationQuery('posts')
+     *      .paginate({
+     *        page: this.castParam('page', 'integer')
+     *      })
+     *   )
+     * }
+     * ```
+     */
+    query: string;
+} | {
+    /**
+     * if provided, a requestBody field will be added
+     * to the openapi spec with the name provided.
+     *
+     * ```ts
+     * @OpenAPI(Post, {
+     *   paginate: {
+     *     body: 'page'
+     *   },
+     * })
+     * public async index() {
+     *   this.ok(
+     *     await this.currentUser
+     *      .associationQuery('posts')
+     *      .paginate({
+     *        page: this.castParam('page', 'integer')
+     *      })
+     *   )
+     * }
+     * ```
+     */
+    body: string;
+};
 export interface OpenapiEndpointRendererDefaultResponseOption {
     description?: string;
     maybeNull?: boolean;

package/dist/types/src/openapi-renderer/helpers/pageParamOpenapiProperty.d.ts

@@ -0,0 +1,4 @@
+export default function openapiPageParamProperty(): {
+    readonly type: "integer";
+    readonly description: "Page number";
+};

package/dist/types/src/openapi-renderer/helpers/safelyAttachPaginationParamsToBodySegment.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @internal
+ *
+ * Used to carefully bind implicit pagination params
+ * to the requestBody properties. It will not apply
+ * the pagination param unless the provided bodySegment
+ * is:
+ *
+ * a.) falsey (null, undefined, etc...)
+ * b.) an openapi object (must have { type: 'object'})
+ *
+ * If neither of these apply, it will simply return
+ * what was given to it, without any modifications
+ */
+export default function safelyAttachPaginationParamToRequestBodySegment<T>(paramName: string, bodySegment: T): T;

package/dist/types/src/psychic-app/index.d.ts

@@ -7,7 +7,7 @@ import * as http from 'node:http';
 import { OpenapiContent, OpenapiHeaders, OpenapiResponses, OpenapiSecurity, OpenapiSecuritySchemes, OpenapiServer } from '../openapi-renderer/endpoint.js';
 import PsychicRouter from '../router/index.js';
 import PsychicServer from '../server/index.js';
-import { PsychicHookEventType, PsychicHookLoadEventTypes } from './types.js';
+import { PsychicHookEventType } from './types.js';
 import { Command } from 'commander';
 export default class PsychicApp {
     static init(cb: (app: PsychicApp) => void | Promise<void>, dreamCb: (app: DreamApp) => void | Promise<void>, opts?: PsychicAppInitOptions): Promise<PsychicApp>;
@@ -70,8 +70,6 @@ export default class PsychicApp {
     get paths(): Required<PsychicPathOptions>;
     private _inflections?;
     get inflections(): (() => void | Promise<void>) | undefined;
-    private _bootHooks;
-    get bootHooks(): Record<PsychicHookLoadEventTypes, ((conf: PsychicApp) => void | Promise<void>)[]>;
     private _specialHooks;
     get specialHooks(): PsychicAppSpecialHooks;
     private _overrides;
@@ -93,18 +91,18 @@ export default class PsychicApp {
     private booted;
     boot(force?: boolean): Promise<void>;
     plugin(cb: (app: PsychicApp) => void | Promise<void>): void;
-    on<T extends PsychicHookEventType>(hookEventType: T, cb: T extends 'server:error' ? (err: Error, req: Request, res: Response) => void | Promise<void> : T extends 'server:init' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:start' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:shutdown' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:init:after-routes' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'cli:start' ? (program: Command) => void | Promise<void> : T extends 'sync' ? () => any : (conf: PsychicApp) => void | Promise<void>): void;
+    on<T extends PsychicHookEventType>(hookEventType: T, cb: T extends 'server:error' ? (err: Error, req: Request, res: Response) => void | Promise<void> : T extends 'server:init:before-middleware' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:init:after-middleware' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:start' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:shutdown' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'server:init:after-routes' ? (psychicServer: PsychicServer) => void | Promise<void> : T extends 'cli:start' ? (program: Command) => void | Promise<void> : T extends 'cli:sync' ? () => any : (conf: PsychicApp) => void | Promise<void>): void;
     set(option: 'openapi', name: string, value: NamedPsychicOpenapiOptions): void;
     set<Opt extends PsychicAppOption>(option: Opt, value: Opt extends 'appName' ? string : Opt extends 'apiOnly' ? boolean : Opt extends 'defaultResponseHeaders' ? Record<string, string | null> : Opt extends 'encryption' ? PsychicAppEncryptionOptions : Opt extends 'cors' ? CorsOptions : Opt extends 'cookie' ? CustomCookieOptions : Opt extends 'apiRoot' ? string : Opt extends 'sessionCookieName' ? string : Opt extends 'clientRoot' ? string : Opt extends 'json' ? bodyParser.Options : Opt extends 'logger' ? PsychicLogger : Opt extends 'client' ? PsychicClientOptions : Opt extends 'ssl' ? PsychicSslCredentials : Opt extends 'openapi' ? DefaultPsychicOpenapiOptions : Opt extends 'paths' ? PsychicPathOptions : Opt extends 'port' ? number : Opt extends 'saltRounds' ? number : Opt extends 'packageManager' ? PsychicAppAllowedPackageManagersEnum : Opt extends 'inflections' ? () => void | Promise<void> : Opt extends 'routes' ? (r: PsychicRouter) => void | Promise<void> : never): void;
     override<Override extends keyof PsychicAppOverrides>(override: Override, value: PsychicAppOverrides[Override]): void;
-    private runHooksFor;
 }
 export type PsychicAppOption = 'appName' | 'apiOnly' | 'apiRoot' | 'encryption' | 'sessionCookieName' | 'client' | 'clientRoot' | 'cookie' | 'cors' | 'defaultResponseHeaders' | 'inflections' | 'json' | 'logger' | 'openapi' | 'packageManager' | 'paths' | 'port' | 'routes' | 'saltRounds' | 'ssl';
 export declare const PsychicAppAllowedPackageManagersEnumValues: readonly ["yarn", "npm", "pnpm"];
 export type PsychicAppAllowedPackageManagersEnum = (typeof PsychicAppAllowedPackageManagersEnumValues)[number];
 export interface PsychicAppSpecialHooks {
-    sync: (() => any)[];
-    serverInit: ((server: PsychicServer) => void | Promise<void>)[];
+    cliSync: (() => any)[];
+    serverInitBeforeMiddleware: ((server: PsychicServer) => void | Promise<void>)[];
+    serverInitAfterMiddleware: ((server: PsychicServer) => void | Promise<void>)[];
     serverInitAfterRoutes: ((server: PsychicServer) => void | Promise<void>)[];
     serverStart: ((server: PsychicServer) => void | Promise<void>)[];
     serverShutdown: ((server: PsychicServer) => void | Promise<void>)[];

package/dist/types/src/psychic-app/types.d.ts

@@ -1,7 +1,6 @@
 import PsychicApp from './index.js';
 export type UUID = string;
-export type PsychicHookEventType = 'boot' | 'sync' | 'load' | 'load:dev' | 'load:prod' | 'load:test' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:error' | 'server:shutdown';
-export type PsychicHookLoadEventTypes = Exclude<PsychicHookEventType, 'server:error' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:shutdown' | 'sync'>;
+export type PsychicHookEventType = 'cli:sync' | 'server:init:before-middleware' | 'server:init:after-middleware' | 'server:init:after-routes' | 'server:start' | 'server:error' | 'server:shutdown';
 export type PsychicAppInitializerCb = (psychicApp: PsychicApp) => void | Promise<void>;
 type Only<T, U> = T & Partial<Record<Exclude<keyof U, keyof T>, never>>;
 export type Either<T, U> = Only<T, U> | Only<U, T>;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.34.5",
+  "version": "0.35.0",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -83,7 +83,7 @@
     "typedoc": "^0.26.6",
     "typescript": "^5.5.4",
     "typescript-eslint": "=7.18.0",
-    "vitest": "^3.1.1",
+    "vitest": "^3.1.3",
     "winston": "^3.14.2"
   },
   "packageManager": "yarn@4.7.0"