@rvoh/psychic 0.28.2 → 0.28.4

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

@@ -1,6 +1,6 @@
 import { DreamBin, DreamCLI } from '@rvoh/dream';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import TypesBuilder from '../cli/helpers/TypesBuilder.js';
 import generateController from '../generate/controller.js';
 import generateResource from '../generate/resource.js';

package/dist/esm/src/cli/helpers/TypesBuilder.js

@@ -1,6 +1,6 @@
 import { DreamApplication } from '@rvoh/dream';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import PsychicApplication from '../../psychic-application/index.js';
 export default class TypesBuilder {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/esm/src/error/psychic-application/init-missing-package-manager.js

@@ -9,8 +9,8 @@ must set packageManager when initializing a new PsychicApplication.
 within conf/app.ts, you must have a call to "#set('packageManager', '<YOUR_CHOSEN_PACKAGE_MANAGER>')", i.e.
 
   // conf/app.ts
-  export default async (app: PsychicApplication) => {
-    await app.set('packageManager', 'yarn')
+  export default async (psy: PsychicApplication) => {
+    psy.set('packageManager', 'yarn')
   }
     `;
     }

package/dist/esm/src/generate/controller.js

@@ -1,6 +1,6 @@
 import { hyphenize, standardizeFullyQualifiedModelName } from '@rvoh/dream';
-import * as fs from 'fs/promises';
 import { existsSync } from 'node:fs';
+import * as fs from 'node:fs/promises';
 import UnexpectedUndefined from '../error/UnexpectedUndefined.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import psychicFileAndDirPaths from '../helpers/path/psychicFileAndDirPaths.js';

package/dist/esm/src/generate/helpers/addResourceToRoutes.js

@@ -1,5 +1,5 @@
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import UnexpectedUndefined from '../../error/UnexpectedUndefined.js';
 import psychicPath from '../../helpers/path/psychicPath.js';
 import PsychicApplication from '../../psychic-application/index.js';

package/dist/esm/src/helpers/autogeneratedFileDisclaimer.js

@@ -1,4 +1,4 @@
-import { DreamGlam } from '@rvoh/dream';
+import { DreamLogos } from '@rvoh/dream';
 export default function autogeneratedFileDisclaimer(startComment = '\n/*', endComment = '\n*/') {
     return `\
 ${startComment}
@@ -13,7 +13,7 @@ ${startComment}
 #--#--#--#--#--#--#--#--#--#--#--#--#--#--#--
 
 
-${DreamGlam.whaaaaaaaaaaokBasic()}
+${DreamLogos.monochrome()}
 
 This file was automatically generated by my cat, Aster.
 He does not want you mucking about with his files,

package/dist/esm/src/helpers/openapiJsonPath.js

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import * as path from 'node:path';
 import UnexpectedUndefined from '../error/UnexpectedUndefined.js';
 import PsychicApplication from '../psychic-application/index.js';
 export default function openapiJsonPath(openapiName = 'default') {

package/dist/esm/src/helpers/path/psychicFileAndDirPaths.js

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import * as path from 'node:path';
 import PsychicApplication from '../../psychic-application/index.js';
 export default function (relDirPath, partialFilePath) {
     const psychicApp = PsychicApplication.getOrFail();

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

@@ -1,6 +1,6 @@
 import { compact } from '@rvoh/dream';
-import * as fs from 'fs/promises';
 import { groupBy } from 'lodash-es';
+import * as fs from 'node:fs/promises';
 import UnexpectedUndefined from '../error/UnexpectedUndefined.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import openapiJsonPath from '../helpers/openapiJsonPath.js';

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

@@ -1,15 +1,15 @@
 import { DreamApplication, Encrypt, } from '@rvoh/dream';
 import PsychicApplicationInitMissingApiRoot from '../error/psychic-application/init-missing-api-root.js';
 import PsychicApplicationInitMissingCallToLoadControllers from '../error/psychic-application/init-missing-call-to-load-controllers.js';
+import PsychicApplicationInitMissingPackageManager from '../error/psychic-application/init-missing-package-manager.js';
 import PsychicApplicationInitMissingRoutesCallback from '../error/psychic-application/init-missing-routes-callback.js';
 import cookieMaxAgeFromCookieOpts from '../helpers/cookieMaxAgeFromCookieOpts.js';
 import EnvInternal from '../helpers/EnvInternal.js';
+import pascalizeFileName from '../helpers/pascalizeFileName.js';
 import { cachePsychicApplication, getCachedPsychicApplicationOrFail } from './cache.js';
 import importControllers, { getControllersOrFail } from './helpers/import/importControllers.js';
-import lookupClassByGlobalName from './helpers/lookupClassByGlobalName.js';
-import PsychicApplicationInitMissingPackageManager from '../error/psychic-application/init-missing-package-manager.js';
 import importServices, { getServicesOrFail } from './helpers/import/importServices.js';
-import pascalizeFileName from '../helpers/pascalizeFileName.js';
+import lookupClassByGlobalName from './helpers/lookupClassByGlobalName.js';
 export default class PsychicApplication {
     static async init(cb, dreamCb, opts = {}) {
         let psychicApp;

package/dist/esm/src/server/helpers/startPsychicServer.js

@@ -1,7 +1,7 @@
 import { DreamCLI } from '@rvoh/dream';
-import * as fs from 'fs';
-import * as http from 'http';
-import * as https from 'https';
+import * as fs from 'node:fs';
+import * as http from 'node:http';
+import * as https from 'node:https';
 import EnvInternal from '../../helpers/EnvInternal.js';
 import PsychicServer from '../../server/index.js';
 export default async function startPsychicServer({ app, port, sslCredentials, }) {

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

@@ -1,9 +1,9 @@
-import { closeAllDbConnections, DreamGlam } from '@rvoh/dream';
+import { closeAllDbConnections, DreamLogos } from '@rvoh/dream';
 import * as cookieParser from 'cookie-parser';
 import * as cors from 'cors';
 import * as express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
-import * as path from 'path';
+import * as path from 'node:path';
 import EnvInternal from '../helpers/EnvInternal.js';
 import isOpenapiError from '../helpers/isOpenapiError.js';
 import PsychicApplication from '../psychic-application/index.js';
@@ -17,7 +17,7 @@ export default class PsychicServer {
         return createPsychicHttpInstance(app, sslCredentials);
     }
     static asciiLogo() {
-        return DreamGlam.fluffstopherwalkin();
+        return DreamLogos.colorful();
     }
     expressApp;
     httpServer;
@@ -131,7 +131,6 @@ export default class PsychicServer {
     }
     buildApp() {
         this.expressApp = express.default();
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.expressApp.use(cookieParser.default());
     }
     initializeCors() {

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

@@ -3,7 +3,7 @@ import * as bodyParser from 'body-parser';
 import { CorsOptions } from 'cors';
 import { Request, Response } from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
-import * as http from 'http';
+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';

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

@@ -1,16 +1,16 @@
-import { Application, Request, Response, Router } from 'express';
+import { Express, Request, Response, Router } from 'express';
 import PsychicController from '../controller/index.js';
 import PsychicApplication from '../psychic-application/index.js';
 import { NamespaceConfig, PsychicControllerActions } from '../router/helpers.js';
 import RouteManager from './route-manager.js';
 import { HttpMethod, ResourcesOptions } from './types.js';
 export default class PsychicRouter {
-    app: Application;
+    app: Express;
     config: PsychicApplication;
     currentNamespaces: NamespaceConfig[];
     routeManager: RouteManager;
-    constructor(app: Application, config: PsychicApplication);
-    get routingMechanism(): Application | Router;
+    constructor(app: Express, config: PsychicApplication);
+    get routingMechanism(): Express | Router;
     get routes(): import("./route-manager.js").RouteConfig[];
     private get currentNamespacePaths();
     commit(): void;
@@ -48,7 +48,7 @@ export default class PsychicRouter {
 }
 export declare class PsychicNestedRouter extends PsychicRouter {
     router: Router;
-    constructor(app: Application, config: PsychicApplication, routeManager: RouteManager, { namespaces, }?: {
+    constructor(app: Express, config: PsychicApplication, routeManager: RouteManager, { namespaces, }?: {
         namespaces?: NamespaceConfig[];
     });
     get routingMechanism(): Router;

package/dist/types/src/server/helpers/startPsychicServer.d.ts

@@ -1,12 +1,12 @@
-import { Application } from 'express';
-import * as http from 'http';
-import { Server } from 'http';
-import * as https from 'https';
+import { Express } from 'express';
+import * as http from 'node:http';
+import { Server } from 'node:http';
+import * as https from 'node:https';
 import { PsychicSslCredentials } from '../../psychic-application/index.js';
 export interface StartPsychicServerOptions {
-    app: Application;
+    app: Express;
     port: number;
     sslCredentials: PsychicSslCredentials | undefined;
 }
 export default function startPsychicServer({ app, port, sslCredentials, }: StartPsychicServerOptions): Promise<Server>;
-export declare function createPsychicHttpInstance(app: Application, sslCredentials: PsychicSslCredentials | undefined): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+export declare function createPsychicHttpInstance(app: Express, sslCredentials: PsychicSslCredentials | undefined): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;

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

@@ -1,12 +1,12 @@
-import { Application } from 'express';
-import { Server } from 'http';
+import { Express } from 'express';
+import { Server } from 'node:http';
 import PsychicApplication, { PsychicSslCredentials } from '../psychic-application/index.js';
 import { StartPsychicServerOptions } from './helpers/startPsychicServer.js';
 export default class PsychicServer {
     static startPsychicServer(opts: StartPsychicServerOptions): Promise<Server>;
-    static createPsychicHttpInstance(app: Application, sslCredentials: PsychicSslCredentials | undefined): Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+    static createPsychicHttpInstance(app: Express, sslCredentials: PsychicSslCredentials | undefined): Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
     static asciiLogo(): string;
-    expressApp: Application;
+    expressApp: Express;
     httpServer: Server;
     private booted;
     constructor();

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.28.2",
+  "version": "0.28.4",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "prepack": "yarn build"
   },
   "dependencies": {
-    "@types/cookie-parser": "^1.4.7",
+    "@types/cookie-parser": "^1.4.8",
     "@types/cors": "^2.8.17",
     "@types/lodash.groupby": "^4.6.9",
     "commander": "^12.1.0",
@@ -62,18 +62,18 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^0.34.0",
-    "@rvoh/dream-spec-helpers": "=0.1.0",
-    "@rvoh/psychic-spec-helpers": "=0.2.0",
-    "@types/express": "^4.17.21",
+    "@rvoh/dream": "^0.35.3",
+    "@rvoh/dream-spec-helpers": "^0.2.4",
+    "@rvoh/psychic-spec-helpers": "^0.4.3",
+    "@types/express": "^5.0.1",
     "@types/lodash-es": "^4",
     "@types/lodash.clonedeep": "^4.5.9",
     "@types/lodash.sortby": "^4.7.9",
     "@types/node": "^22.5.1",
     "@types/pg": "^8.11.8",
-    "@types/supertest": "^6.0.2",
+    "@types/supertest": "^6.0.3",
     "eslint": "^9.19.0",
-    "express": "^4.21.1",
+    "express": "^5.1.0",
     "jsdom": "^26.0.0",
     "kysely": "^0.27.4",
     "kysely-codegen": "~0.17.0",