@rvoh/psychic 2.3.6 → 2.3.9

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

@@ -32,6 +32,10 @@ ${INDENT}    - date
 ${INDENT}    - date[]
 ${INDENT}    - datetime
 ${INDENT}    - datetime[]
+${INDENT}    - time
+${INDENT}    - time[]
+${INDENT}    - timetz
+${INDENT}    - timetz[]
 ${INDENT}    - integer
 ${INDENT}    - integer[]
 ${INDENT}

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

@@ -60,6 +60,10 @@ export const PsychicParamsPrimitiveLiterals = [
     'number[]',
     'string',
     'string[]',
+    'time',
+    'time[]',
+    'timetz',
+    'timetz[]',
     'uuid',
     'uuid[]',
 ];

package/dist/cjs/src/devtools/helpers/launchDevServer.js

@@ -6,7 +6,7 @@ import UnexpectedUndefined from '../../error/UnexpectedUndefined.js';
 import PsychicApp from '../../psychic-app/index.js';
 const devServerProcesses = {};
 const debugEnabled = debuglog('psychic').enabled;
-export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', timeout = 5000 } = {}) {
+export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', timeout = 5000, onStdOut } = {}) {
     if (devServerProcesses[key])
         return;
     if (debugEnabled)
@@ -20,6 +20,21 @@ export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', t
             ...process.env,
         },
     });
+    // NOTE: adding this stdout spy so that
+    // when this cli utility runs node commands,
+    // it can properly hijack the stdout from the command
+    proc.stdout?.on('data', chunk => {
+        const txt = chunk?.toString()?.trim();
+        if (typeof txt !== 'string' || !txt)
+            return;
+        if (onStdOut) {
+            onStdOut(txt);
+        }
+        else {
+            // eslint-disable-next-line no-console
+            console.log(txt);
+        }
+    });
     devServerProcesses[key] = proc;
     await waitForPort(key, port, timeout);
     proc.on('error', err => {

package/dist/cjs/src/error/openapi/UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute.js

@@ -0,0 +1,44 @@
+export default class UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute extends Error {
+    source;
+    attributeName;
+    dbType;
+    constructor(source, attributeName, dbType) {
+        super();
+        this.source = source;
+        this.attributeName = attributeName;
+        this.dbType = dbType;
+    }
+    get message() {
+        return `
+While trying to compute the openapi shape for either a serializer or a controller's
+request body, we ran into a db type that we didn't know how to automatically infer the
+openapi shape for. In these cases, we recommend that you provide an explicit openapi
+shape for these attributes, so that the openapi shape can be properly generated.
+
+source:               ${this.source}
+attribute:            ${this.attributeName}
+unexpected db type:   ${this.dbType}
+
+If the culprit is a serializer attribute, you should provide an explicit openapi definition
+to the attribute causing your problems, like so:
+
+  .attribute('${this.attributeName}', { openapi: { type: 'string' }})
+
+If, instead, it is a controller's request body causing your problems, identify the controller
+method responsible for this exception, and ensure that the openapi request body shape is explicitly
+defined, so that you do not force psychic to autocompute the openapi body shape for this endpoint.
+
+    @OpenAPI(MyModel, {
+      requestBody: {
+        type: 'object',
+        properties: {
+          ${this.attributeName}: {
+            type: 'string',
+          }
+        }
+      }
+    })
+  
+`;
+    }
+}

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

@@ -14,7 +14,7 @@ import NoSerializerFoundForRendersOneAndMany from '../error/openapi/NoSerializer
 import ObjectSerializerRendersOneAndManyRequireClassType from '../error/openapi/ObjectSerializerRendersOneAndManyRequireClassType.js';
 import allSerializersFromHandWrittenOpenapi from './helpers/allSerializersFromHandWrittenOpenapi.js';
 import allSerializersToRefsInOpenapi from './helpers/allSerializersToRefsInOpenapi.js';
-import { dreamColumnOpenapiShape } from './helpers/dreamAttributeOpenapiShape.js';
+import { dreamColumnOpenapiShape } from './helpers/dreamColumnOpenapiShape.js';
 import openapiShorthandToOpenapi from './helpers/openapiShorthandToOpenapi.js';
 const NULL_OBJECT_OPENAPI = { type: 'null' };
 export default class SerializerOpenapiRenderer {
@@ -153,7 +153,7 @@ export default class SerializerOpenapiRenderer {
                             target = DataTypeForOpenapi;
                         }
                         accumulator[outputAttributeName] = allSerializersToRefsInOpenapi(target?.isDream
-                            ? dreamColumnOpenapiShape(target, attribute.name, openapi, {
+                            ? dreamColumnOpenapiShape(this.serializer.globalName, target, attribute.name, openapi, {
                                 suppressResponseEnums: this.suppressResponseEnums,
                             })
                             : openapiShorthandToOpenapi(openapi));

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

@@ -10,7 +10,7 @@ import openapiParamNamesForDreamClass from '../server/helpers/openapiParamNamesF
 import OpenapiSegmentExpander from './body-segment.js';
 import { DEFAULT_OPENAPI_RESPONSES } from './defaults.js';
 import cursorPaginationParamOpenapiProperty from './helpers/cursorPaginationParamOpenapiProperty.js';
-import { dreamColumnOpenapiShape } from './helpers/dreamAttributeOpenapiShape.js';
+import { dreamColumnOpenapiShape } from './helpers/dreamColumnOpenapiShape.js';
 import openapiOpts from './helpers/openapiOpts.js';
 import openapiRoute from './helpers/openapiRoute.js';
 import paginationPageParamOpenapiProperty from './helpers/paginationPageParamOpenapiProperty.js';
@@ -317,7 +317,7 @@ export default class OpenapiEndpointRenderer {
             return (controllerRouteConf.controller === this.controllerClass && controllerRouteConf.action === this.action);
         });
         const route = this.action === 'update'
-            ? filteredRoutes.find(routeConfig => routeConfig.httpMethod === 'patch')
+            ? filteredRoutes.find(routeConfig => routeConfig.httpMethod === 'patch') || filteredRoutes.at(0)
             : filteredRoutes.at(0);
         if (!route)
             throw new MissingControllerActionPairingInRoutes(this.controllerClass, this.action);
@@ -545,7 +545,7 @@ export default class OpenapiEndpointRenderer {
             paramsShape.required = required;
         }
         paramsShape.properties = paramSafeColumns.reduce((acc, columnName) => {
-            acc[columnName] = dreamColumnOpenapiShape(dreamClass, columnName, undefined, {
+            acc[columnName] = dreamColumnOpenapiShape(this.controllerClass.controllerActionPath(this.action), dreamClass, columnName, undefined, {
                 allowGenericJson: true,
             });
             return acc;

package/dist/cjs/src/openapi-renderer/helpers/{dreamAttributeOpenapiShape.js → dreamColumnOpenapiShape.js}

@@ -1,7 +1,13 @@
 import { SerializingPlainPropertyWithoutOpenapiShape } from '../../error/openapi/SerializingPlainPropertyWithoutOpenapiShape.js';
+import UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute from '../../error/openapi/UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute.js';
 import OpenapiSegmentExpander from '../body-segment.js';
 import openapiShorthandToOpenapi from './openapiShorthandToOpenapi.js';
-export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined, { suppressResponseEnums = false, allowGenericJson = false, } = {}) {
+export function dreamColumnOpenapiShape(
+// this is the global name of the serializer or controller calling down
+// to get this information. If an unrecognized db type is provided, the
+// source will be rendered in the exception that is returned, enabling
+// the dev to identify the source of the issue and fix it
+source, dreamClass, column, openapi = undefined, { suppressResponseEnums = false, allowGenericJson = false, } = {}) {
     if (dreamClass.isVirtualColumn(column)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
         const openapiObject = openapiShorthandToOpenapi((openapi ?? {}));
@@ -46,7 +52,7 @@ export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined,
     }
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
     const openapiObject = openapiShorthandToOpenapi((openapi ?? {}));
-    const singleType = singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, openapiObject);
+    const singleType = singularAttributeOpenapiShape(source, column, dreamColumnInfo, suppressResponseEnums, openapiObject);
     if (dreamColumnInfo.isArray) {
         return {
             type: dreamColumnInfo.allowNull ? ['array', 'null'] : 'array',
@@ -71,7 +77,12 @@ export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined,
 function baseDbType(dreamColumnInfo) {
     return dreamColumnInfo.dbType.replace('[]', '');
 }
-function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, openapiSchema) {
+function singularAttributeOpenapiShape(
+// this is the global name of the serializer or controller calling down
+// to get this information. If an unrecognized db type is provided, the
+// source will be rendered in the exception that is returned, enabling
+// the dev to identify the source of the issue and fix it
+source, column, dreamColumnInfo, suppressResponseEnums, openapiSchema) {
     if (dreamColumnInfo.enumValues) {
         const enumOverrides = openapiSchema.enum || dreamColumnInfo.enumValues;
         if (suppressResponseEnums) {
@@ -102,6 +113,10 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'money':
         case 'path':
         case 'text':
+        case 'time':
+        case 'time without time zone':
+        case 'timetz':
+        case 'time with time zone':
         case 'uuid':
         case 'varbit':
         case 'varchar':
@@ -121,8 +136,6 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'real':
             return { type: 'number' };
         case 'datetime':
-        case 'time':
-        case 'time with time zone':
         case 'timestamp':
         case 'timestamp with time zone':
         case 'timestamp without time zone':
@@ -133,7 +146,7 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'jsonb':
             return { type: 'object' };
         default:
-            throw new Error(`Unrecognized dbType used in serializer OpenAPI type declaration: ${dreamColumnInfo.dbType}`);
+            throw new UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute(source, column, dreamColumnInfo.dbType);
     }
 }
 export class UseCustomOpenapiForJson extends Error {

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

@@ -246,6 +246,10 @@ Try setting it to something valid, like:
     get port() {
         return this._port;
     }
+    _httpServerOptions = {};
+    get httpServerOptions() {
+        return this._httpServerOptions;
+    }
     _corsOptions = {};
     get corsOptions() {
         return this._corsOptions;
@@ -485,6 +489,9 @@ Try setting it to something valid, like:
             case 'apiOnly':
                 this._apiOnly = value;
                 break;
+            case 'httpServerOptions':
+                this._httpServerOptions = value;
+                break;
             case 'apiRoot':
                 this._apiRoot = value;
                 break;

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

@@ -16,16 +16,18 @@ export default async function startPsychicServer({ app, port, sslCredentials, })
     });
 }
 export function createPsychicHttpInstance(app, sslCredentials) {
+    const psychicApp = PsychicApp.getOrFail();
     if (sslCredentials?.key && sslCredentials?.cert) {
         return https.createServer({
             key: fs.readFileSync(sslCredentials.key),
             cert: fs.readFileSync(sslCredentials.cert),
             ca: sslCredentials.ca?.map(filePath => fs.readFileSync(filePath)),
             rejectUnauthorized: sslCredentials?.rejectUnauthorized,
+            ...psychicApp.httpServerOptions,
         }, app);
     }
     else {
-        return http.createServer(app);
+        return http.createServer(psychicApp.httpServerOptions, app);
     }
 }
 function welcomeMessage({ port }) {

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

@@ -1,4 +1,4 @@
-import { CalendarDate, DateTime } from '@rvoh/dream';
+import { CalendarDate, ClockTime, ClockTimeTz, DateTime } from '@rvoh/dream';
 import { camelize, compact, snakeify } from '@rvoh/dream/utils';
 import ParamValidationError from '../error/controller/ParamValidationError.js';
 import ParamValidationErrors from '../error/controller/ParamValidationErrors.js';
@@ -85,6 +85,22 @@ export default class Params {
                     case 'timestamp without time zone[]':
                         returnObj[columnName] = this.cast(params, columnName.toString(), 'datetime[]', { allowNull: columnMetadata.allowNull });
                         break;
+                    case 'time':
+                    case 'time without time zone':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'time', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'time[]':
+                    case 'time without time zone[]':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'time[]', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'timetz':
+                    case 'time with time zone':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'timetz', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'timetz[]':
+                    case 'time with time zone[]':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'timetz[]', { allowNull: columnMetadata.allowNull });
+                        break;
                     case 'jsonb':
                         returnObj[columnName] = this.cast(params, columnName.toString(), 'json', { allowNull: columnMetadata.allowNull });
                         break;
@@ -203,7 +219,6 @@ export default class Params {
             }
             return paramValue;
         }
-        let dateClass;
         const integerRegexp = /^-?\d+$/;
         switch (expectedType) {
             case 'string':
@@ -227,7 +242,8 @@ export default class Params {
                     return false;
                 throw new ParamValidationError(paramName, [typeToError(expectedType)]);
             case 'datetime':
-            case 'date':
+            case 'date': {
+                let dateClass;
                 switch (expectedType) {
                     case 'datetime':
                         dateClass = DateTime;
@@ -252,6 +268,35 @@ export default class Params {
                     }
                 }
                 throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+            }
+            case 'time':
+            case 'timetz': {
+                let timeClass;
+                switch (expectedType) {
+                    case 'time':
+                        timeClass = ClockTime;
+                        break;
+                    case 'timetz':
+                        timeClass = ClockTimeTz;
+                        break;
+                    default:
+                        if (typeof expectedType === 'string')
+                            throw Error(`${expectedType} must be "time" or "timetz"`);
+                        else
+                            throw Error(`expectedType is not a string`);
+                }
+                if (paramValue instanceof ClockTime || paramValue instanceof ClockTimeTz)
+                    return paramValue;
+                if (typeof paramValue === 'string') {
+                    try {
+                        return timeClass.fromISO(paramValue);
+                    }
+                    catch {
+                        throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+                    }
+                }
+                throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+            }
             case 'integer':
                 if (typeof paramValue !== 'string' && typeof paramValue !== 'number')
                     throw new ParamValidationError(paramName, [typeToError(expectedType)]);
@@ -287,6 +332,8 @@ export default class Params {
             case 'json[]':
             case 'number[]':
             case 'string[]':
+            case 'time[]':
+            case 'timetz[]':
             case 'uuid[]':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (!Array.isArray(paramValue))
@@ -365,6 +412,8 @@ const typeToErrorMap = {
     null: 'expecting null',
     number: 'expected number or string number',
     string: 'expected string',
+    time: 'expected ISO time string',
+    timetz: 'expected ISO timetz string',
     uuid: 'expected uuid',
     'bigint[]': 'expected bigint array',
     'boolean[]': 'expected boolean array',
@@ -375,6 +424,8 @@ const typeToErrorMap = {
     'null[]': 'expecting null array',
     'number[]': 'expected number or string number array',
     'string[]': 'expected string array',
+    'time[]': 'expected ISO time string array',
+    'timetz[]': 'expected ISO timetz string array',
     'uuid[]': 'expected uuid array',
 };
 function typeToError(param) {
@@ -393,6 +444,8 @@ const arrayTypeToNonArrayTypeMap = {
     'null[]': 'null',
     'number[]': 'number',
     'string[]': 'string',
+    'time[]': 'time',
+    'timetz[]': 'timetz',
     'uuid[]': 'uuid',
 };
 function arrayTypeToNonArrayType(param) {

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

@@ -32,6 +32,10 @@ ${INDENT}    - date
 ${INDENT}    - date[]
 ${INDENT}    - datetime
 ${INDENT}    - datetime[]
+${INDENT}    - time
+${INDENT}    - time[]
+${INDENT}    - timetz
+${INDENT}    - timetz[]
 ${INDENT}    - integer
 ${INDENT}    - integer[]
 ${INDENT}

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

@@ -60,6 +60,10 @@ export const PsychicParamsPrimitiveLiterals = [
     'number[]',
     'string',
     'string[]',
+    'time',
+    'time[]',
+    'timetz',
+    'timetz[]',
     'uuid',
     'uuid[]',
 ];

package/dist/esm/src/devtools/helpers/launchDevServer.js

@@ -6,7 +6,7 @@ import UnexpectedUndefined from '../../error/UnexpectedUndefined.js';
 import PsychicApp from '../../psychic-app/index.js';
 const devServerProcesses = {};
 const debugEnabled = debuglog('psychic').enabled;
-export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', timeout = 5000 } = {}) {
+export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', timeout = 5000, onStdOut } = {}) {
     if (devServerProcesses[key])
         return;
     if (debugEnabled)
@@ -20,6 +20,21 @@ export async function launchDevServer(key, { port = 3000, cmd = 'pnpm client', t
             ...process.env,
         },
     });
+    // NOTE: adding this stdout spy so that
+    // when this cli utility runs node commands,
+    // it can properly hijack the stdout from the command
+    proc.stdout?.on('data', chunk => {
+        const txt = chunk?.toString()?.trim();
+        if (typeof txt !== 'string' || !txt)
+            return;
+        if (onStdOut) {
+            onStdOut(txt);
+        }
+        else {
+            // eslint-disable-next-line no-console
+            console.log(txt);
+        }
+    });
     devServerProcesses[key] = proc;
     await waitForPort(key, port, timeout);
     proc.on('error', err => {

package/dist/esm/src/error/openapi/UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute.js

@@ -0,0 +1,44 @@
+export default class UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute extends Error {
+    source;
+    attributeName;
+    dbType;
+    constructor(source, attributeName, dbType) {
+        super();
+        this.source = source;
+        this.attributeName = attributeName;
+        this.dbType = dbType;
+    }
+    get message() {
+        return `
+While trying to compute the openapi shape for either a serializer or a controller's
+request body, we ran into a db type that we didn't know how to automatically infer the
+openapi shape for. In these cases, we recommend that you provide an explicit openapi
+shape for these attributes, so that the openapi shape can be properly generated.
+
+source:               ${this.source}
+attribute:            ${this.attributeName}
+unexpected db type:   ${this.dbType}
+
+If the culprit is a serializer attribute, you should provide an explicit openapi definition
+to the attribute causing your problems, like so:
+
+  .attribute('${this.attributeName}', { openapi: { type: 'string' }})
+
+If, instead, it is a controller's request body causing your problems, identify the controller
+method responsible for this exception, and ensure that the openapi request body shape is explicitly
+defined, so that you do not force psychic to autocompute the openapi body shape for this endpoint.
+
+    @OpenAPI(MyModel, {
+      requestBody: {
+        type: 'object',
+        properties: {
+          ${this.attributeName}: {
+            type: 'string',
+          }
+        }
+      }
+    })
+  
+`;
+    }
+}

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

@@ -14,7 +14,7 @@ import NoSerializerFoundForRendersOneAndMany from '../error/openapi/NoSerializer
 import ObjectSerializerRendersOneAndManyRequireClassType from '../error/openapi/ObjectSerializerRendersOneAndManyRequireClassType.js';
 import allSerializersFromHandWrittenOpenapi from './helpers/allSerializersFromHandWrittenOpenapi.js';
 import allSerializersToRefsInOpenapi from './helpers/allSerializersToRefsInOpenapi.js';
-import { dreamColumnOpenapiShape } from './helpers/dreamAttributeOpenapiShape.js';
+import { dreamColumnOpenapiShape } from './helpers/dreamColumnOpenapiShape.js';
 import openapiShorthandToOpenapi from './helpers/openapiShorthandToOpenapi.js';
 const NULL_OBJECT_OPENAPI = { type: 'null' };
 export default class SerializerOpenapiRenderer {
@@ -153,7 +153,7 @@ export default class SerializerOpenapiRenderer {
                             target = DataTypeForOpenapi;
                         }
                         accumulator[outputAttributeName] = allSerializersToRefsInOpenapi(target?.isDream
-                            ? dreamColumnOpenapiShape(target, attribute.name, openapi, {
+                            ? dreamColumnOpenapiShape(this.serializer.globalName, target, attribute.name, openapi, {
                                 suppressResponseEnums: this.suppressResponseEnums,
                             })
                             : openapiShorthandToOpenapi(openapi));

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

@@ -10,7 +10,7 @@ import openapiParamNamesForDreamClass from '../server/helpers/openapiParamNamesF
 import OpenapiSegmentExpander from './body-segment.js';
 import { DEFAULT_OPENAPI_RESPONSES } from './defaults.js';
 import cursorPaginationParamOpenapiProperty from './helpers/cursorPaginationParamOpenapiProperty.js';
-import { dreamColumnOpenapiShape } from './helpers/dreamAttributeOpenapiShape.js';
+import { dreamColumnOpenapiShape } from './helpers/dreamColumnOpenapiShape.js';
 import openapiOpts from './helpers/openapiOpts.js';
 import openapiRoute from './helpers/openapiRoute.js';
 import paginationPageParamOpenapiProperty from './helpers/paginationPageParamOpenapiProperty.js';
@@ -317,7 +317,7 @@ export default class OpenapiEndpointRenderer {
             return (controllerRouteConf.controller === this.controllerClass && controllerRouteConf.action === this.action);
         });
         const route = this.action === 'update'
-            ? filteredRoutes.find(routeConfig => routeConfig.httpMethod === 'patch')
+            ? filteredRoutes.find(routeConfig => routeConfig.httpMethod === 'patch') || filteredRoutes.at(0)
             : filteredRoutes.at(0);
         if (!route)
             throw new MissingControllerActionPairingInRoutes(this.controllerClass, this.action);
@@ -545,7 +545,7 @@ export default class OpenapiEndpointRenderer {
             paramsShape.required = required;
         }
         paramsShape.properties = paramSafeColumns.reduce((acc, columnName) => {
-            acc[columnName] = dreamColumnOpenapiShape(dreamClass, columnName, undefined, {
+            acc[columnName] = dreamColumnOpenapiShape(this.controllerClass.controllerActionPath(this.action), dreamClass, columnName, undefined, {
                 allowGenericJson: true,
             });
             return acc;

package/dist/esm/src/openapi-renderer/helpers/{dreamAttributeOpenapiShape.js → dreamColumnOpenapiShape.js}

@@ -1,7 +1,13 @@
 import { SerializingPlainPropertyWithoutOpenapiShape } from '../../error/openapi/SerializingPlainPropertyWithoutOpenapiShape.js';
+import UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute from '../../error/openapi/UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute.js';
 import OpenapiSegmentExpander from '../body-segment.js';
 import openapiShorthandToOpenapi from './openapiShorthandToOpenapi.js';
-export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined, { suppressResponseEnums = false, allowGenericJson = false, } = {}) {
+export function dreamColumnOpenapiShape(
+// this is the global name of the serializer or controller calling down
+// to get this information. If an unrecognized db type is provided, the
+// source will be rendered in the exception that is returned, enabling
+// the dev to identify the source of the issue and fix it
+source, dreamClass, column, openapi = undefined, { suppressResponseEnums = false, allowGenericJson = false, } = {}) {
     if (dreamClass.isVirtualColumn(column)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
         const openapiObject = openapiShorthandToOpenapi((openapi ?? {}));
@@ -46,7 +52,7 @@ export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined,
     }
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
     const openapiObject = openapiShorthandToOpenapi((openapi ?? {}));
-    const singleType = singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, openapiObject);
+    const singleType = singularAttributeOpenapiShape(source, column, dreamColumnInfo, suppressResponseEnums, openapiObject);
     if (dreamColumnInfo.isArray) {
         return {
             type: dreamColumnInfo.allowNull ? ['array', 'null'] : 'array',
@@ -71,7 +77,12 @@ export function dreamColumnOpenapiShape(dreamClass, column, openapi = undefined,
 function baseDbType(dreamColumnInfo) {
     return dreamColumnInfo.dbType.replace('[]', '');
 }
-function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, openapiSchema) {
+function singularAttributeOpenapiShape(
+// this is the global name of the serializer or controller calling down
+// to get this information. If an unrecognized db type is provided, the
+// source will be rendered in the exception that is returned, enabling
+// the dev to identify the source of the issue and fix it
+source, column, dreamColumnInfo, suppressResponseEnums, openapiSchema) {
     if (dreamColumnInfo.enumValues) {
         const enumOverrides = openapiSchema.enum || dreamColumnInfo.enumValues;
         if (suppressResponseEnums) {
@@ -102,6 +113,10 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'money':
         case 'path':
         case 'text':
+        case 'time':
+        case 'time without time zone':
+        case 'timetz':
+        case 'time with time zone':
         case 'uuid':
         case 'varbit':
         case 'varchar':
@@ -121,8 +136,6 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'real':
             return { type: 'number' };
         case 'datetime':
-        case 'time':
-        case 'time with time zone':
         case 'timestamp':
         case 'timestamp with time zone':
         case 'timestamp without time zone':
@@ -133,7 +146,7 @@ function singularAttributeOpenapiShape(dreamColumnInfo, suppressResponseEnums, o
         case 'jsonb':
             return { type: 'object' };
         default:
-            throw new Error(`Unrecognized dbType used in serializer OpenAPI type declaration: ${dreamColumnInfo.dbType}`);
+            throw new UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute(source, column, dreamColumnInfo.dbType);
     }
 }
 export class UseCustomOpenapiForJson extends Error {

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

@@ -246,6 +246,10 @@ Try setting it to something valid, like:
     get port() {
         return this._port;
     }
+    _httpServerOptions = {};
+    get httpServerOptions() {
+        return this._httpServerOptions;
+    }
     _corsOptions = {};
     get corsOptions() {
         return this._corsOptions;
@@ -485,6 +489,9 @@ Try setting it to something valid, like:
             case 'apiOnly':
                 this._apiOnly = value;
                 break;
+            case 'httpServerOptions':
+                this._httpServerOptions = value;
+                break;
             case 'apiRoot':
                 this._apiRoot = value;
                 break;

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

@@ -16,16 +16,18 @@ export default async function startPsychicServer({ app, port, sslCredentials, })
     });
 }
 export function createPsychicHttpInstance(app, sslCredentials) {
+    const psychicApp = PsychicApp.getOrFail();
     if (sslCredentials?.key && sslCredentials?.cert) {
         return https.createServer({
             key: fs.readFileSync(sslCredentials.key),
             cert: fs.readFileSync(sslCredentials.cert),
             ca: sslCredentials.ca?.map(filePath => fs.readFileSync(filePath)),
             rejectUnauthorized: sslCredentials?.rejectUnauthorized,
+            ...psychicApp.httpServerOptions,
         }, app);
     }
     else {
-        return http.createServer(app);
+        return http.createServer(psychicApp.httpServerOptions, app);
     }
 }
 function welcomeMessage({ port }) {

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

@@ -1,4 +1,4 @@
-import { CalendarDate, DateTime } from '@rvoh/dream';
+import { CalendarDate, ClockTime, ClockTimeTz, DateTime } from '@rvoh/dream';
 import { camelize, compact, snakeify } from '@rvoh/dream/utils';
 import ParamValidationError from '../error/controller/ParamValidationError.js';
 import ParamValidationErrors from '../error/controller/ParamValidationErrors.js';
@@ -85,6 +85,22 @@ export default class Params {
                     case 'timestamp without time zone[]':
                         returnObj[columnName] = this.cast(params, columnName.toString(), 'datetime[]', { allowNull: columnMetadata.allowNull });
                         break;
+                    case 'time':
+                    case 'time without time zone':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'time', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'time[]':
+                    case 'time without time zone[]':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'time[]', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'timetz':
+                    case 'time with time zone':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'timetz', { allowNull: columnMetadata.allowNull });
+                        break;
+                    case 'timetz[]':
+                    case 'time with time zone[]':
+                        returnObj[columnName] = this.cast(params, columnName.toString(), 'timetz[]', { allowNull: columnMetadata.allowNull });
+                        break;
                     case 'jsonb':
                         returnObj[columnName] = this.cast(params, columnName.toString(), 'json', { allowNull: columnMetadata.allowNull });
                         break;
@@ -203,7 +219,6 @@ export default class Params {
             }
             return paramValue;
         }
-        let dateClass;
         const integerRegexp = /^-?\d+$/;
         switch (expectedType) {
             case 'string':
@@ -227,7 +242,8 @@ export default class Params {
                     return false;
                 throw new ParamValidationError(paramName, [typeToError(expectedType)]);
             case 'datetime':
-            case 'date':
+            case 'date': {
+                let dateClass;
                 switch (expectedType) {
                     case 'datetime':
                         dateClass = DateTime;
@@ -252,6 +268,35 @@ export default class Params {
                     }
                 }
                 throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+            }
+            case 'time':
+            case 'timetz': {
+                let timeClass;
+                switch (expectedType) {
+                    case 'time':
+                        timeClass = ClockTime;
+                        break;
+                    case 'timetz':
+                        timeClass = ClockTimeTz;
+                        break;
+                    default:
+                        if (typeof expectedType === 'string')
+                            throw Error(`${expectedType} must be "time" or "timetz"`);
+                        else
+                            throw Error(`expectedType is not a string`);
+                }
+                if (paramValue instanceof ClockTime || paramValue instanceof ClockTimeTz)
+                    return paramValue;
+                if (typeof paramValue === 'string') {
+                    try {
+                        return timeClass.fromISO(paramValue);
+                    }
+                    catch {
+                        throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+                    }
+                }
+                throw new ParamValidationError(paramName, [typeToError(expectedType)]);
+            }
             case 'integer':
                 if (typeof paramValue !== 'string' && typeof paramValue !== 'number')
                     throw new ParamValidationError(paramName, [typeToError(expectedType)]);
@@ -287,6 +332,8 @@ export default class Params {
             case 'json[]':
             case 'number[]':
             case 'string[]':
+            case 'time[]':
+            case 'timetz[]':
             case 'uuid[]':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (!Array.isArray(paramValue))
@@ -365,6 +412,8 @@ const typeToErrorMap = {
     null: 'expecting null',
     number: 'expected number or string number',
     string: 'expected string',
+    time: 'expected ISO time string',
+    timetz: 'expected ISO timetz string',
     uuid: 'expected uuid',
     'bigint[]': 'expected bigint array',
     'boolean[]': 'expected boolean array',
@@ -375,6 +424,8 @@ const typeToErrorMap = {
     'null[]': 'expecting null array',
     'number[]': 'expected number or string number array',
     'string[]': 'expected string array',
+    'time[]': 'expected ISO time string array',
+    'timetz[]': 'expected ISO timetz string array',
     'uuid[]': 'expected uuid array',
 };
 function typeToError(param) {
@@ -393,6 +444,8 @@ const arrayTypeToNonArrayTypeMap = {
     'null[]': 'null',
     'number[]': 'number',
     'string[]': 'string',
+    'time[]': 'time',
+    'timetz[]': 'timetz',
     'uuid[]': 'uuid',
 };
 function arrayTypeToNonArrayType(param) {

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

@@ -14,7 +14,7 @@ export type ControllerActionMetadata = Record<string, {
     serializerKey?: string;
 }>;
 export type PsychicParamsPrimitive = string | number | boolean | null | undefined | PsychicParamsPrimitive[];
-export declare const PsychicParamsPrimitiveLiterals: readonly ["bigint", "bigint[]", "boolean", "boolean[]", "date", "date[]", "datetime", "datetime[]", "integer", "integer[]", "json", "json[]", "null", "null[]", "number", "number[]", "string", "string[]", "uuid", "uuid[]"];
+export declare const PsychicParamsPrimitiveLiterals: readonly ["bigint", "bigint[]", "boolean", "boolean[]", "date", "date[]", "datetime", "datetime[]", "integer", "integer[]", "json", "json[]", "null", "null[]", "number", "number[]", "string", "string[]", "time", "time[]", "timetz", "timetz[]", "uuid", "uuid[]"];
 export type PsychicParamsPrimitiveLiteral = (typeof PsychicParamsPrimitiveLiterals)[number];
 export interface PsychicParamsDictionary {
     [key: string]: PsychicParamsPrimitive | PsychicParamsDictionary | PsychicParamsDictionary[];

package/dist/types/src/devtools/helpers/launchDevServer.d.ts

@@ -1,8 +1,9 @@
-export declare function launchDevServer(key: string, { port, cmd, timeout }?: LaunchDevServerOpts): Promise<void>;
+export declare function launchDevServer(key: string, { port, cmd, timeout, onStdOut }?: LaunchDevServerOpts): Promise<void>;
 export declare function stopDevServer(key: string): void;
 export declare function stopDevServers(): void;
 export interface LaunchDevServerOpts {
     port?: number;
     cmd?: string;
     timeout?: number;
+    onStdOut?: (message: string) => void;
 }

package/dist/types/src/error/openapi/UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute.d.ts

@@ -0,0 +1,7 @@
+export default class UnrecognizedDbTypeFoundWhileComputingOpenapiAttribute extends Error {
+    private source;
+    private attributeName;
+    private dbType;
+    constructor(source: string, attributeName: string, dbType: string);
+    get message(): string;
+}

package/dist/types/src/openapi-renderer/helpers/{dreamAttributeOpenapiShape.d.ts → dreamColumnOpenapiShape.d.ts}

@@ -5,7 +5,7 @@ export interface VirtualAttributeStatement {
     type: OpenapiShorthandPrimitiveTypes | OpenapiSchemaBodyShorthand | undefined;
 }
 type DreamClassColumnNames<DreamClass extends typeof Dream, DreamInstance extends InstanceType<DreamClass> = InstanceType<DreamClass>, DB = DreamInstance['DB'], TableName extends keyof DB = DreamInstance['table'] & keyof DB, Table extends DB[keyof DB] = DB[TableName]> = keyof Table & string;
-export declare function dreamColumnOpenapiShape<DreamClass extends typeof Dream>(dreamClass: DreamClass, column: DreamClassColumnNames<DreamClass>, openapi?: OpenapiDescription | OpenapiSchemaBodyShorthand | OpenapiShorthandPrimitiveTypes | undefined, { suppressResponseEnums, allowGenericJson, }?: {
+export declare function dreamColumnOpenapiShape<DreamClass extends typeof Dream>(source: string, dreamClass: DreamClass, column: DreamClassColumnNames<DreamClass>, openapi?: OpenapiDescription | OpenapiSchemaBodyShorthand | OpenapiShorthandPrimitiveTypes | undefined, { suppressResponseEnums, allowGenericJson, }?: {
     suppressResponseEnums?: boolean;
     allowGenericJson?: boolean;
 }): OpenapiSchemaBody;

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

@@ -7,6 +7,7 @@ import { Command } from 'commander';
 import { CorsOptions } from 'cors';
 import { Express, Request, RequestHandler, Response } from 'express';
 import * as http from 'node:http';
+import * as https from 'node:https';
 import { OpenapiValidateTarget } from '../openapi-renderer/defaults.js';
 import { OpenapiContent, OpenapiHeaders, OpenapiResponses, OpenapiSecurity, OpenapiSecuritySchemes, OpenapiServer, OpenapiValidateOption } from '../openapi-renderer/endpoint.js';
 import PsychicRouter from '../router/index.js';
@@ -34,7 +35,7 @@ export default class PsychicApp {
     /**
      * @internal
      */
-    static getPsychicHttpInstance(app: Express, sslCredentials: PsychicSslCredentials | undefined): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | import("https").Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    static getPsychicHttpInstance(app: Express, sslCredentials: PsychicSslCredentials | undefined): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | https.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     /**
      * Builds the routes cache if it does not already
      * exist. This is called during PsychicApp.init,
@@ -139,6 +140,8 @@ export default class PsychicApp {
     get appName(): string;
     private _port;
     get port(): number;
+    private _httpServerOptions;
+    get httpServerOptions(): http.ServerOptions<typeof http.IncomingMessage, typeof http.ServerResponse> | https.ServerOptions<typeof http.IncomingMessage, typeof http.ServerResponse>;
     private _corsOptions;
     get corsOptions(): CorsOptions;
     private _jsonOptions;
@@ -222,10 +225,10 @@ export default class PsychicApp {
     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: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 'importExtension' ? GeneratorImportStyle : Opt extends 'sessionCookieName' ? string : Opt extends 'json' ? bodyParser.Options : Opt extends 'logger' ? PsychicLogger : Opt extends 'ssl' ? PsychicSslCredentials : Opt extends 'openapi' ? DefaultPsychicOpenapiOptions : Opt extends 'paths' ? PsychicPathOptions : Opt extends 'port' ? number : Opt extends 'saltRounds' ? number : Opt extends 'sanitizeResponseJson' ? boolean : Opt extends 'packageManager' ? DreamAppAllowedPackageManagersEnum : Opt extends 'inflections' ? () => void | Promise<void> : Opt extends 'routes' ? (r: PsychicRouter) => void | Promise<void> : never): 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 'httpServerOptions' ? http.ServerOptions | https.ServerOptions : Opt extends 'encryption' ? PsychicAppEncryptionOptions : Opt extends 'cors' ? CorsOptions : Opt extends 'cookie' ? CustomCookieOptions : Opt extends 'apiRoot' ? string : Opt extends 'importExtension' ? GeneratorImportStyle : Opt extends 'sessionCookieName' ? string : Opt extends 'json' ? bodyParser.Options : Opt extends 'logger' ? PsychicLogger : Opt extends 'ssl' ? PsychicSslCredentials : Opt extends 'openapi' ? DefaultPsychicOpenapiOptions : Opt extends 'paths' ? PsychicPathOptions : Opt extends 'port' ? number : Opt extends 'saltRounds' ? number : Opt extends 'sanitizeResponseJson' ? boolean : Opt extends 'packageManager' ? DreamAppAllowedPackageManagersEnum : 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;
 }
-export type PsychicAppOption = 'appName' | 'apiOnly' | 'apiRoot' | 'importExtension' | 'encryption' | 'sessionCookieName' | 'cookie' | 'cors' | 'defaultResponseHeaders' | 'inflections' | 'json' | 'logger' | 'openapi' | 'packageManager' | 'paths' | 'port' | 'routes' | 'saltRounds' | 'sanitizeResponseJson' | 'ssl';
+export type PsychicAppOption = 'appName' | 'apiOnly' | 'apiRoot' | 'httpServerOptions' | 'importExtension' | 'encryption' | 'sessionCookieName' | 'cookie' | 'cors' | 'defaultResponseHeaders' | 'inflections' | 'json' | 'logger' | 'openapi' | 'packageManager' | 'paths' | 'port' | 'routes' | 'saltRounds' | 'sanitizeResponseJson' | 'ssl';
 export interface PsychicAppSpecialHooks {
     cliSync: (() => any)[];
     serverInitBeforeMiddleware: ((server: PsychicServer) => void | Promise<void>)[];

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

@@ -1,4 +1,4 @@
-import { CalendarDate, DateTime, Dream } from '@rvoh/dream';
+import { CalendarDate, ClockTime, ClockTimeTz, DateTime, Dream } from '@rvoh/dream';
 import { OpenapiSchemaArray, OpenapiSchemaBody, OpenapiSchemaInteger, OpenapiSchemaNumber, OpenapiSchemaObjectBase, OpenapiSchemaPrimitiveGeneric, OpenapiSchemaPropertiesShorthand, OpenapiSchemaString } from '@rvoh/dream/openapi';
 import { DreamParamSafeAttributes, DreamParamSafeColumnNames, StrictInterface } from '@rvoh/dream/types';
 import { PsychicParamsDictionary, PsychicParamsPrimitive, PsychicParamsPrimitiveLiteral } from '../controller/index.js';
@@ -62,7 +62,7 @@ export default class Params {
 }
 export type ValidatedReturnType<ExpectedType, OptsType> = ExpectedType extends RegExp ? string : ExpectedType extends 'string' ? OptsType extends {
     enum: infer EnumValue;
-} ? EnumValue extends readonly string[] ? EnumValue[number] : never : string : ExpectedType extends 'number' ? number : ExpectedType extends 'datetime' ? DateTime : ExpectedType extends 'date' ? CalendarDate : ExpectedType extends 'bigint' ? string : ExpectedType extends 'integer' ? number : ExpectedType extends 'json' ? object : ExpectedType extends 'boolean' ? boolean : ExpectedType extends 'null' ? null : ExpectedType extends 'uuid' ? string : ExpectedType extends 'datetime[]' ? DateTime[] : ExpectedType extends 'date[]' ? CalendarDate[] : ExpectedType extends 'string[]' ? OptsType extends {
+} ? EnumValue extends readonly string[] ? EnumValue[number] : never : string : ExpectedType extends 'number' ? number : ExpectedType extends 'datetime' ? DateTime : ExpectedType extends 'date' ? CalendarDate : ExpectedType extends 'time' ? ClockTime : ExpectedType extends 'timetz' ? ClockTimeTz : ExpectedType extends 'bigint' ? string : ExpectedType extends 'integer' ? number : ExpectedType extends 'json' ? object : ExpectedType extends 'boolean' ? boolean : ExpectedType extends 'null' ? null : ExpectedType extends 'uuid' ? string : ExpectedType extends 'datetime[]' ? DateTime[] : ExpectedType extends 'date[]' ? CalendarDate[] : ExpectedType extends 'time[]' ? ClockTime[] : ExpectedType extends 'timetz[]' ? ClockTimeTz[] : ExpectedType extends 'string[]' ? OptsType extends {
     enum: infer EnumValue;
 } ? EnumValue extends readonly string[] ? EnumValue[number][] : never : string[] : ExpectedType extends 'bigint[]' ? string[] : ExpectedType extends 'number[]' ? number[] : ExpectedType extends 'integer[]' ? number[] : ExpectedType extends 'boolean[]' ? boolean : ExpectedType extends 'null[]' ? null[] : ExpectedType extends 'uuid[]' ? string[] : OpenapiShapeToInterface<ExpectedType, 0>;
 type OpenapiShapeToInterface<T, Depth extends number> = Depth extends 30 ? never : T extends OpenapiSchemaObjectBase ? {

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "2.3.6",
+  "version": "2.3.9",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -79,7 +79,7 @@
     "yoctocolors": "^2.1.1"
   },
   "peerDependencies": {
-    "@rvoh/dream": "^2.2.0",
+    "@rvoh/dream": "^2.3.0",
     "@types/express": "^5.0.1",
     "commander": "^12.1.0",
     "express": "^5.2.1",
@@ -88,8 +88,8 @@
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^2.2.3",
-    "@rvoh/dream-spec-helpers": "^2.0.0",
+    "@rvoh/dream": "^2.3.0",
+    "@rvoh/dream-spec-helpers": "^2.1.1",
     "@rvoh/psychic-spec-helpers": "^2.0.0",
     "@types/body-parser": "^1.19.6",
     "@types/express": "^5.0.6",