@rvoh/psychic 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -58,3 +58,11 @@ Fix route printing regression causing route printouts to show the path instead o
 
 - pass packageManager through to dream, now that it accepts a packageManager setting.
 - update dream shadowing within psychic application initialization to take place after initializers and plugins are processed, so that those initializers and plugins have an opportunity to adjust the settings.
+
+## 1.1.6
+
+- fix regression caused by missing --schema-only option in psychic cli
+
+## 1.1.7
+
+- Add support for middleware arrays, enabling express plugins like passport

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

@@ -54,9 +54,11 @@ class PsychicBin {
     static async routes() {
         await (0, printRoutes_js_1.default)();
     }
-    static async sync({ bypassDreamSync = false } = {}) {
+    static async sync({ bypassDreamSync = false, schemaOnly = false, } = {}) {
         if (!bypassDreamSync)
-            await dream_1.DreamBin.sync(() => { });
+            await dream_1.DreamBin.sync(() => { }, { schemaOnly });
+        if (schemaOnly)
+            return;
         await PsychicBin.syncTypes();
         const psychicApp = index_js_1.default.getOrFail();
         dream_1.DreamCLI.logger.logStartProgress('running post-sync operations...');

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

@@ -137,9 +137,10 @@ class PsychicCLI {
         program
             .command('sync')
             .description('sync introspects your database, updating your schema to reflect, and then syncs the new schema with the installed dream node module, allowing it provide your schema to the underlying kysely integration')
-            .action(async () => {
+            .option('--schema-only')
+            .action(async (options = {}) => {
             await initializePsychicApp();
-            await index_js_1.default.sync();
+            await index_js_1.default.sync(options);
             process.exit();
         });
         program

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

@@ -38,9 +38,7 @@ class PsychicRouter {
         this.routes.forEach(route => {
             if (route.middleware) {
                 const routeConf = route;
-                this.app[routeConf.httpMethod]((0, helpers_js_1.routePath)(routeConf.path), (req, res, next) => {
-                    this.handleMiddleware(routeConf.middleware, { req, res, next }).catch(() => { });
-                });
+                this.app[routeConf.httpMethod]((0, helpers_js_1.routePath)(routeConf.path), ...(Array.isArray(routeConf.middleware) ? routeConf.middleware : [routeConf.middleware]));
             }
             else {
                 const routeConf = route;
@@ -75,7 +73,7 @@ class PsychicRouter {
     }
     crud(httpMethod, path, controllerOrMiddleware, action) {
         this.checkPathForInvalidChars(path);
-        const isMiddleware = typeof controllerOrMiddleware === 'function' &&
+        const isMiddleware = (typeof controllerOrMiddleware === 'function' || Array.isArray(controllerOrMiddleware)) &&
             !controllerOrMiddleware?.isPsychicController;
         // devs can provide custom express middleware which bypasses
         // the normal Controller#action paradigm.
@@ -222,9 +220,6 @@ suggested fix:  "${(0, helpers_js_1.convertRouteParams)(path)}"
         if (nestedRouter)
             nestedRouter.currentNamespaces = this.currentNamespaces;
     }
-    async handleMiddleware(middleware, { req, res, next, }) {
-        await middleware(req, res, next);
-    }
     async handle(controller, action, { req, res, }) {
         const controllerInstance = this._initializeController(controller, req, res, action);
         if (typeof controllerInstance[action] !== 'function') {

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

@@ -26,9 +26,11 @@ export default class PsychicBin {
     static async routes() {
         await printRoutes();
     }
-    static async sync({ bypassDreamSync = false } = {}) {
+    static async sync({ bypassDreamSync = false, schemaOnly = false, } = {}) {
         if (!bypassDreamSync)
-            await DreamBin.sync(() => { });
+            await DreamBin.sync(() => { }, { schemaOnly });
+        if (schemaOnly)
+            return;
         await PsychicBin.syncTypes();
         const psychicApp = PsychicApp.getOrFail();
         DreamCLI.logger.logStartProgress('running post-sync operations...');

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

@@ -132,9 +132,10 @@ export default class PsychicCLI {
         program
             .command('sync')
             .description('sync introspects your database, updating your schema to reflect, and then syncs the new schema with the installed dream node module, allowing it provide your schema to the underlying kysely integration')
-            .action(async () => {
+            .option('--schema-only')
+            .action(async (options = {}) => {
             await initializePsychicApp();
-            await PsychicBin.sync();
+            await PsychicBin.sync(options);
             process.exit();
         });
         program

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

@@ -32,9 +32,7 @@ export default class PsychicRouter {
         this.routes.forEach(route => {
             if (route.middleware) {
                 const routeConf = route;
-                this.app[routeConf.httpMethod](routePath(routeConf.path), (req, res, next) => {
-                    this.handleMiddleware(routeConf.middleware, { req, res, next }).catch(() => { });
-                });
+                this.app[routeConf.httpMethod](routePath(routeConf.path), ...(Array.isArray(routeConf.middleware) ? routeConf.middleware : [routeConf.middleware]));
             }
             else {
                 const routeConf = route;
@@ -69,7 +67,7 @@ export default class PsychicRouter {
     }
     crud(httpMethod, path, controllerOrMiddleware, action) {
         this.checkPathForInvalidChars(path);
-        const isMiddleware = typeof controllerOrMiddleware === 'function' &&
+        const isMiddleware = (typeof controllerOrMiddleware === 'function' || Array.isArray(controllerOrMiddleware)) &&
             !controllerOrMiddleware?.isPsychicController;
         // devs can provide custom express middleware which bypasses
         // the normal Controller#action paradigm.
@@ -216,9 +214,6 @@ suggested fix:  "${convertRouteParams(path)}"
         if (nestedRouter)
             nestedRouter.currentNamespaces = this.currentNamespaces;
     }
-    async handleMiddleware(middleware, { req, res, next, }) {
-        await middleware(req, res, next);
-    }
     async handle(controller, action, { req, res, }) {
         const controllerInstance = this._initializeController(controller, req, res, action);
         if (typeof controllerInstance[action] !== 'function') {

package/dist/types/src/bin/index.d.ts

@@ -7,8 +7,9 @@ export default class PsychicBin {
         owningModel?: string;
     }): Promise<void>;
     static routes(): Promise<void>;
-    static sync({ bypassDreamSync }?: {
+    static sync({ bypassDreamSync, schemaOnly, }?: {
         bypassDreamSync?: boolean;
+        schemaOnly?: boolean;
     }): Promise<void>;
     static postSync(): Promise<void>;
     static syncTypes(customTypes?: any): Promise<void>;

package/dist/types/src/router/index.d.ts

@@ -1,4 +1,4 @@
-import { Express, NextFunction, Request, RequestHandler, Response, Router } from 'express';
+import { Express, Request, RequestHandler, Response, Router } from 'express';
 import PsychicController from '../controller/index.js';
 import PsychicApp from '../psychic-app/index.js';
 import { NamespaceConfig, PsychicControllerActions } from '../router/helpers.js';
@@ -15,26 +15,26 @@ export default class PsychicRouter {
     private get currentNamespacePaths();
     commit(): void;
     get(path: string): void;
-    get(path: string, middleware: RequestHandler): void;
+    get(path: string, middleware: RequestHandler | RequestHandler[]): void;
     get<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     post(path: string): void;
-    post(path: string, middleware: RequestHandler): void;
+    post(path: string, middleware: RequestHandler | RequestHandler[]): void;
     post<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     put(path: string): void;
-    put(path: string, middleware: RequestHandler): void;
+    put(path: string, middleware: RequestHandler | RequestHandler[]): void;
     put<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     patch(path: string): void;
-    patch(path: string, middleware: RequestHandler): void;
+    patch(path: string, middleware: RequestHandler | RequestHandler[]): void;
     patch<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     delete(path: string): void;
-    delete(path: string, middleware: RequestHandler): void;
+    delete(path: string, middleware: RequestHandler | RequestHandler[]): void;
     delete<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     options(path: string): void;
-    options(path: string, middleware: RequestHandler): void;
+    options(path: string, middleware: RequestHandler | RequestHandler[]): void;
     options<T extends typeof PsychicController>(path: string, controller: T, action: PsychicControllerActions<T>): void;
     private prefixPathWithNamespaces;
     crud(httpMethod: HttpMethod, path: string): void;
-    crud(httpMethod: HttpMethod, path: string, middleware: RequestHandler): void;
+    crud(httpMethod: HttpMethod, path: string, middleware: RequestHandler | RequestHandler[]): void;
     crud(httpMethod: HttpMethod, path: string, controller: typeof PsychicController, action: string): void;
     private checkPathForInvalidChars;
     namespace(namespace: string, cb: (router: PsychicNestedRouter) => void): void;
@@ -48,11 +48,6 @@ export default class PsychicRouter {
     private addNamespace;
     private removeLastNamespace;
     private makeRoomForNewIdParam;
-    handleMiddleware(middleware: RequestHandler, { req, res, next, }: {
-        req: Request;
-        res: Response;
-        next: NextFunction;
-    }): Promise<void>;
     handle(controller: typeof PsychicController, action: string, { req, res, }: {
         req: Request;
         res: Response;

package/dist/types/src/router/route-manager.d.ts

@@ -12,7 +12,7 @@ export default class RouteManager {
     addMiddleware({ httpMethod, path, middleware, }: {
         httpMethod: HttpMethod;
         path: string;
-        middleware: RequestHandler;
+        middleware: RequestHandler | RequestHandler[];
     }): void;
 }
 export type RouteConfig = ControllerActionRouteConfig | MiddlewareRouteConfig;
@@ -25,6 +25,6 @@ export type ControllerActionRouteConfig = BaseRouteConfig & {
     action: string;
 };
 export type MiddlewareRouteConfig = BaseRouteConfig & {
-    middleware: RequestHandler;
+    middleware: RequestHandler | RequestHandler[];
 };
 export {};

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -63,17 +63,23 @@
     "@rvoh/dream-spec-helpers": "^1.0.0",
     "@rvoh/psychic-spec-helpers": "^1.0.0",
     "@types/express": "^5.0.1",
+    "@types/express-session": "^1",
     "@types/node": "^22.5.1",
+    "@types/passport": "^0",
+    "@types/passport-local": "^1",
     "@types/pg": "^8.11.8",
     "@types/supertest": "^6.0.3",
     "@typescript/analyze-trace": "^0.10.1",
     "eslint": "^9.19.0",
     "express": "^5.1.0",
+    "express-session": "^1.18.1",
     "jsdom": "^26.0.0",
     "kysely": "^0.27.4",
     "kysely-codegen": "~0.17.0",
     "luxon-jest-matchers": "^0.1.14",
     "openapi-typescript": "^7.8.0",
+    "passport": "^0.7.0",
+    "passport-local": "^1.0.0",
     "pg": "^8.12.0",
     "prettier": "^3.3.3",
     "puppeteer": "^24.4.0",