@rvoh/psychic 0.32.0 → 0.33.0

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

@@ -41,7 +41,7 @@ function BeforeAction(opts = {}) {
  * @param tags - Optional. string array
  * @param uri - Optional. A list of uri segments that this endpoint uses
  */
-function OpenAPI(modelOrSerializer, opts) {
+function OpenAPI(modelOrSerializer, _opts) {
     return function (_, context) {
         const methodName = context.name;
         context.addInitializer(function () {
@@ -54,19 +54,25 @@ function OpenAPI(modelOrSerializer, opts) {
                 psychicControllerClass.openapi = {};
             if (!Object.getOwnPropertyDescriptor(psychicControllerClass, 'controllerActionMetadata'))
                 psychicControllerClass['controllerActionMetadata'] = {};
-            if (opts) {
-                psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(modelOrSerializer, psychicControllerClass, methodNameString, opts);
+            if (_opts) {
+                const opts = _opts;
+                psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                modelOrSerializer, psychicControllerClass, methodNameString, opts);
                 psychicControllerClass['controllerActionMetadata'][methodNameString] ||= {};
-                psychicControllerClass['controllerActionMetadata'][methodNameString]['serializerKey'] =
-                    opts.serializerKey;
+                psychicControllerClass['controllerActionMetadata'][methodNameString]['serializerKey'] = opts.serializerKey;
                 //
             }
             else {
                 if (isSerializable(modelOrSerializer)) {
-                    psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(modelOrSerializer, psychicControllerClass, methodNameString, undefined);
+                    psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    modelOrSerializer, psychicControllerClass, methodNameString, undefined);
                 }
                 else {
-                    psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(null, psychicControllerClass, methodNameString, modelOrSerializer);
+                    psychicControllerClass.openapi[methodNameString] = new endpoint_js_1.default(null, psychicControllerClass, methodNameString, 
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    modelOrSerializer);
                 }
             }
         });

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class OpenApiDecoratorModelMissingSerializer extends Error {
+    modelClass;
+    serializerKey;
+    constructor(modelClass, serializerKey) {
+        super();
+        this.modelClass = modelClass;
+        this.serializerKey = serializerKey;
+    }
+    get message() {
+        return `
+The specified class does not have a serializer for the specified serializer key:
+
+class: ${this.modelClass.name}
+serializer key: ${this.serializerKey.toString()}
+`;
+    }
+}
+exports.default = OpenApiDecoratorModelMissingSerializer;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class OpenApiDecoratorModelMissingSerializerGetter extends Error {
+    modelClass;
+    constructor(modelClass) {
+        super();
+        this.modelClass = modelClass;
+    }
+    get message() {
+        return `
+Model passed to @OpenAPI decorator is missing a serializers getter:
+
+class: ${this.modelClass.name}
+`;
+    }
+}
+exports.default = OpenApiDecoratorModelMissingSerializerGetter;

package/dist/cjs/src/helpers/alternateParamName.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = alternateParamName;
+const isArrayParamName_js_1 = __importDefault(require("./isArrayParamName.js"));
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function alternateParamName(paramName) {
+    if (typeof paramName !== 'string')
+        throw new Error(`paramName is not a string. received: ${paramName}`);
+    return (0, isArrayParamName_js_1.default)(paramName) ? paramName.replace(/\[\]$/, '') : `${paramName}[]`;
+}

package/dist/cjs/src/helpers/isArrayParamName.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = isArrayParamName;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isArrayParamName(paramName) {
+    if (typeof paramName !== 'string')
+        return false;
+    return /\[\]$/.test(paramName);
+}

package/dist/cjs/src/openapi-renderer/body-segment.js

@@ -32,6 +32,7 @@ const isBlankDescription_js_1 = __importDefault(require("./helpers/isBlankDescri
 const primitiveOpenapiStatementToOpenapi_js_1 = __importStar(require("./helpers/primitiveOpenapiStatementToOpenapi.js"));
 const schemaToRef_js_1 = __importDefault(require("./helpers/schemaToRef.js"));
 const serializer_js_1 = __importDefault(require("./serializer.js"));
+const isArrayParamName_js_1 = __importDefault(require("../helpers/isArrayParamName.js"));
 class OpenapiBodySegmentRenderer {
     controllerClass;
     bodySegment;
@@ -304,7 +305,7 @@ class OpenapiBodySegmentRenderer {
         }
     }
     typeIsOpenapiArrayPrimitive(openapiType) {
-        return /\[\]$/.test((0, primitiveOpenapiStatementToOpenapi_js_1.maybeNullPrimitiveToPrimitive)(openapiType));
+        return (0, isArrayParamName_js_1.default)((0, primitiveOpenapiStatementToOpenapi_js_1.maybeNullPrimitiveToPrimitive)(openapiType));
     }
     applyConfigurationOptions(obj) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MissingControllerActionPairingInRoutes = void 0;
 const dream_1 = require("@rvoh/dream");
 const lodash_es_1 = require("lodash-es");
+const OpenApiDecoratorModelMissingSerializer_js_1 = __importDefault(require("../error/openapi/OpenApiDecoratorModelMissingSerializer.js"));
+const OpenApiDecoratorModelMissingSerializerGetter_js_1 = __importDefault(require("../error/openapi/OpenApiDecoratorModelMissingSerializerGetter.js"));
 const index_js_1 = __importDefault(require("../psychic-app/index.js"));
 const body_segment_js_1 = __importDefault(require("./body-segment.js"));
 const defaults_js_1 = require("./defaults.js");
@@ -690,12 +692,11 @@ class OpenapiEndpointRenderer {
      */
     parseMultiEntitySerializerResponseShape() {
         const anyOf = { anyOf: [] };
-        this.getSerializerClasses().forEach(serializerClass => {
+        const sortedSerializerClasses = (0, dream_1.sortBy)(this.getSerializerClasses() || [], serializerClass => serializerClass.openapiName);
+        sortedSerializerClasses.forEach(serializerClass => {
             const serializerKey = serializerClass.openapiName;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const serializerObject = {
                 $ref: `#/components/schemas/${serializerKey}`,
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             };
             anyOf.anyOf.push(serializerObject);
         });
@@ -758,12 +759,20 @@ class OpenapiEndpointRenderer {
     getSerializerClasses() {
         if (!this.dreamsOrSerializers)
             return null;
-        if (Array.isArray(this.dreamsOrSerializers)) {
-            return (0, dream_1.compact)(this.dreamsOrSerializers.map(s => this.getSerializerClass(s)));
-        }
-        else {
-            return (0, dream_1.compact)([this.getSerializerClass(this.dreamsOrSerializers)]);
-        }
+        const dreamsOrSerializers = this.expandStiSerializersInDreamsOrSerializers(this.dreamsOrSerializers);
+        return (0, dream_1.compact)(dreamsOrSerializers.map(s => this.getSerializerClass(s)));
+    }
+    expandStiSerializersInDreamsOrSerializers(dreamsOrSerializers) {
+        if (Array.isArray(dreamsOrSerializers))
+            return dreamsOrSerializers.flatMap(dreamOrSerializer => this.expandStiSerializersInDreamsOrSerializers(dreamOrSerializer));
+        if (dreamsOrSerializers.prototype instanceof dream_1.DreamSerializer)
+            return [dreamsOrSerializers];
+        if (dreamsOrSerializers.prototype instanceof dream_1.Dream)
+            return this.expandDreamStiClasses(dreamsOrSerializers);
+        return [dreamsOrSerializers];
+    }
+    expandDreamStiClasses(dreamClass) {
+        return dreamClass['extendedBy'] ? [...dreamClass['extendedBy']] : [dreamClass];
     }
     /**
      * @internal
@@ -795,10 +804,19 @@ class OpenapiEndpointRenderer {
         else {
             const modelClass = dreamOrSerializerOrViewModel;
             const modelPrototype = modelClass.prototype;
-            const serializerKey = modelPrototype.serializers[this.serializerKey || 'default'];
-            if (serializerKey === undefined)
-                throw new Error(`no serializerKey for ${this.serializerKey || 'default'}`);
-            return dreamApp.serializers[serializerKey] ?? null;
+            const serializerKey = this.serializerKey || 'default';
+            let serializerGlobalName;
+            try {
+                serializerGlobalName =
+                    modelPrototype.serializers[serializerKey];
+            }
+            catch {
+                throw new OpenApiDecoratorModelMissingSerializerGetter_js_1.default(modelClass);
+            }
+            if (serializerGlobalName === undefined) {
+                throw new OpenApiDecoratorModelMissingSerializer_js_1.default(modelClass, serializerKey);
+            }
+            return dreamApp.serializers[serializerGlobalName] ?? null;
         }
     }
 }

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

@@ -7,14 +7,14 @@ exports.PsychicNestedRouter = void 0;
 const dream_1 = require("@rvoh/dream");
 const express_1 = require("express");
 const pluralize_esm_1 = __importDefault(require("pluralize-esm"));
+const ParamValidationError_js_1 = __importDefault(require("../error/controller/ParamValidationError.js"));
+const ParamValidationErrors_js_1 = __importDefault(require("../error/controller/ParamValidationErrors.js"));
 const EnvInternal_js_1 = __importDefault(require("../helpers/EnvInternal.js"));
 const errorIsRescuableHttpError_js_1 = __importDefault(require("../helpers/error/errorIsRescuableHttpError.js"));
 const index_js_1 = __importDefault(require("../psychic-app/index.js"));
 const helpers_js_1 = require("../router/helpers.js");
 const route_manager_js_1 = __importDefault(require("./route-manager.js"));
 const types_js_1 = require("./types.js");
-const ParamValidationErrors_js_1 = __importDefault(require("../error/controller/ParamValidationErrors.js"));
-const ParamValidationError_js_1 = __importDefault(require("../error/controller/ParamValidationError.js"));
 class PsychicRouter {
     app;
     config;
@@ -101,7 +101,7 @@ class PsychicRouter {
         });
         const currentNamespace = replacedNamespaces[replacedNamespaces.length - 1];
         if (!currentNamespace)
-            throw new Error('Must be within a resource to call the collection method');
+            throw new Error('Must be within a `resources` declaration to call the collection method');
         cb(nestedRouter);
     }
     makeResource(path, optionsOrCb, cb, plural) {
@@ -194,9 +194,8 @@ class PsychicRouter {
         }
         catch (error) {
             const err = error;
-            const psychicApp = index_js_1.default.getOrFail();
             if (!EnvInternal_js_1.default.isTest)
-                psychicApp.logger.error(err.message);
+                index_js_1.default.logWithLevel('error', err.message);
             if ((0, errorIsRescuableHttpError_js_1.default)(err)) {
                 const httpErr = err;
                 if (httpErr.data) {

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

@@ -8,6 +8,8 @@ const ParamValidationError_js_1 = __importDefault(require("../error/controller/P
 const ParamValidationErrors_js_1 = __importDefault(require("../error/controller/ParamValidationErrors.js"));
 const isUuid_js_1 = __importDefault(require("../helpers/isUuid.js"));
 const typechecks_js_1 = require("../helpers/typechecks.js");
+const isArrayParamName_js_1 = __importDefault(require("../helpers/isArrayParamName.js"));
+const alternateParamName_js_1 = __importDefault(require("../helpers/alternateParamName.js"));
 class Params {
     $params;
     /**
@@ -173,8 +175,12 @@ class Params {
      * Params.cast(this.params.stuff, 'string', { enum: ['chalupas', 'other'] })
      * ```
      */
-    static cast(params, paramName, expectedType, opts) {
-        const param = params[paramName];
+    static cast(_params, paramName, expectedType, opts) {
+        const params = _params;
+        let param = params[paramName];
+        if (param === undefined && (0, isArrayParamName_js_1.default)(expectedType)) {
+            param = params[(0, alternateParamName_js_1.default)(paramName)];
+        }
         return new this(params).cast(paramName, typeof param === 'string' ? param.trim() : param, expectedType, opts);
     }
     static casing(params, casing) {

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

@@ -34,7 +34,7 @@ export function BeforeAction(opts = {}) {
  * @param tags - Optional. string array
  * @param uri - Optional. A list of uri segments that this endpoint uses
  */
-export function OpenAPI(modelOrSerializer, opts) {
+export function OpenAPI(modelOrSerializer, _opts) {
     return function (_, context) {
         const methodName = context.name;
         context.addInitializer(function () {
@@ -47,19 +47,25 @@ export function OpenAPI(modelOrSerializer, opts) {
                 psychicControllerClass.openapi = {};
             if (!Object.getOwnPropertyDescriptor(psychicControllerClass, 'controllerActionMetadata'))
                 psychicControllerClass['controllerActionMetadata'] = {};
-            if (opts) {
-                psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(modelOrSerializer, psychicControllerClass, methodNameString, opts);
+            if (_opts) {
+                const opts = _opts;
+                psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                modelOrSerializer, psychicControllerClass, methodNameString, opts);
                 psychicControllerClass['controllerActionMetadata'][methodNameString] ||= {};
-                psychicControllerClass['controllerActionMetadata'][methodNameString]['serializerKey'] =
-                    opts.serializerKey;
+                psychicControllerClass['controllerActionMetadata'][methodNameString]['serializerKey'] = opts.serializerKey;
                 //
             }
             else {
                 if (isSerializable(modelOrSerializer)) {
-                    psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(modelOrSerializer, psychicControllerClass, methodNameString, undefined);
+                    psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    modelOrSerializer, psychicControllerClass, methodNameString, undefined);
                 }
                 else {
-                    psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(null, psychicControllerClass, methodNameString, modelOrSerializer);
+                    psychicControllerClass.openapi[methodNameString] = new OpenapiEndpointRenderer(null, psychicControllerClass, methodNameString, 
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    modelOrSerializer);
                 }
             }
         });

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

@@ -0,0 +1,17 @@
+export default class OpenApiDecoratorModelMissingSerializer extends Error {
+    modelClass;
+    serializerKey;
+    constructor(modelClass, serializerKey) {
+        super();
+        this.modelClass = modelClass;
+        this.serializerKey = serializerKey;
+    }
+    get message() {
+        return `
+The specified class does not have a serializer for the specified serializer key:
+
+class: ${this.modelClass.name}
+serializer key: ${this.serializerKey.toString()}
+`;
+    }
+}

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

@@ -0,0 +1,14 @@
+export default class OpenApiDecoratorModelMissingSerializerGetter extends Error {
+    modelClass;
+    constructor(modelClass) {
+        super();
+        this.modelClass = modelClass;
+    }
+    get message() {
+        return `
+Model passed to @OpenAPI decorator is missing a serializers getter:
+
+class: ${this.modelClass.name}
+`;
+    }
+}

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

@@ -0,0 +1,7 @@
+import isArrayParamName from './isArrayParamName.js';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export default function alternateParamName(paramName) {
+    if (typeof paramName !== 'string')
+        throw new Error(`paramName is not a string. received: ${paramName}`);
+    return isArrayParamName(paramName) ? paramName.replace(/\[\]$/, '') : `${paramName}[]`;
+}

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

@@ -0,0 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export default function isArrayParamName(paramName) {
+    if (typeof paramName !== 'string')
+        return false;
+    return /\[\]$/.test(paramName);
+}

package/dist/esm/src/openapi-renderer/body-segment.js

@@ -4,6 +4,7 @@ import isBlankDescription from './helpers/isBlankDescription.js';
 import primitiveOpenapiStatementToOpenapi, { maybeNullPrimitiveToPrimitive, } from './helpers/primitiveOpenapiStatementToOpenapi.js';
 import schemaToRef from './helpers/schemaToRef.js';
 import OpenapiSerializerRenderer from './serializer.js';
+import isArrayParamName from '../helpers/isArrayParamName.js';
 export default class OpenapiBodySegmentRenderer {
     controllerClass;
     bodySegment;
@@ -276,7 +277,7 @@ export default class OpenapiBodySegmentRenderer {
         }
     }
     typeIsOpenapiArrayPrimitive(openapiType) {
-        return /\[\]$/.test(maybeNullPrimitiveToPrimitive(openapiType));
+        return isArrayParamName(maybeNullPrimitiveToPrimitive(openapiType));
     }
     applyConfigurationOptions(obj) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment

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

@@ -1,5 +1,7 @@
-import { DreamApp, compact, } from '@rvoh/dream';
+import { Dream, DreamApp, DreamSerializer, compact, sortBy, } from '@rvoh/dream';
 import { cloneDeep } from 'lodash-es';
+import OpenApiDecoratorModelMissingSerializer from '../error/openapi/OpenApiDecoratorModelMissingSerializer.js';
+import OpenApiDecoratorModelMissingSerializerGetter from '../error/openapi/OpenApiDecoratorModelMissingSerializerGetter.js';
 import PsychicApp from '../psychic-app/index.js';
 import OpenapiBodySegmentRenderer from './body-segment.js';
 import { DEFAULT_OPENAPI_RESPONSES } from './defaults.js';
@@ -684,12 +686,11 @@ export default class OpenapiEndpointRenderer {
      */
     parseMultiEntitySerializerResponseShape() {
         const anyOf = { anyOf: [] };
-        this.getSerializerClasses().forEach(serializerClass => {
+        const sortedSerializerClasses = sortBy(this.getSerializerClasses() || [], serializerClass => serializerClass.openapiName);
+        sortedSerializerClasses.forEach(serializerClass => {
             const serializerKey = serializerClass.openapiName;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const serializerObject = {
                 $ref: `#/components/schemas/${serializerKey}`,
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             };
             anyOf.anyOf.push(serializerObject);
         });
@@ -752,12 +753,20 @@ export default class OpenapiEndpointRenderer {
     getSerializerClasses() {
         if (!this.dreamsOrSerializers)
             return null;
-        if (Array.isArray(this.dreamsOrSerializers)) {
-            return compact(this.dreamsOrSerializers.map(s => this.getSerializerClass(s)));
-        }
-        else {
-            return compact([this.getSerializerClass(this.dreamsOrSerializers)]);
-        }
+        const dreamsOrSerializers = this.expandStiSerializersInDreamsOrSerializers(this.dreamsOrSerializers);
+        return compact(dreamsOrSerializers.map(s => this.getSerializerClass(s)));
+    }
+    expandStiSerializersInDreamsOrSerializers(dreamsOrSerializers) {
+        if (Array.isArray(dreamsOrSerializers))
+            return dreamsOrSerializers.flatMap(dreamOrSerializer => this.expandStiSerializersInDreamsOrSerializers(dreamOrSerializer));
+        if (dreamsOrSerializers.prototype instanceof DreamSerializer)
+            return [dreamsOrSerializers];
+        if (dreamsOrSerializers.prototype instanceof Dream)
+            return this.expandDreamStiClasses(dreamsOrSerializers);
+        return [dreamsOrSerializers];
+    }
+    expandDreamStiClasses(dreamClass) {
+        return dreamClass['extendedBy'] ? [...dreamClass['extendedBy']] : [dreamClass];
     }
     /**
      * @internal
@@ -789,10 +798,19 @@ export default class OpenapiEndpointRenderer {
         else {
             const modelClass = dreamOrSerializerOrViewModel;
             const modelPrototype = modelClass.prototype;
-            const serializerKey = modelPrototype.serializers[this.serializerKey || 'default'];
-            if (serializerKey === undefined)
-                throw new Error(`no serializerKey for ${this.serializerKey || 'default'}`);
-            return dreamApp.serializers[serializerKey] ?? null;
+            const serializerKey = this.serializerKey || 'default';
+            let serializerGlobalName;
+            try {
+                serializerGlobalName =
+                    modelPrototype.serializers[serializerKey];
+            }
+            catch {
+                throw new OpenApiDecoratorModelMissingSerializerGetter(modelClass);
+            }
+            if (serializerGlobalName === undefined) {
+                throw new OpenApiDecoratorModelMissingSerializer(modelClass, serializerKey);
+            }
+            return dreamApp.serializers[serializerGlobalName] ?? null;
         }
     }
 }

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

@@ -1,14 +1,14 @@
 import { RecordNotFound, ValidationError, camelize } from '@rvoh/dream';
 import { Router } from 'express';
 import pluralize from 'pluralize-esm';
+import ParamValidationError from '../error/controller/ParamValidationError.js';
+import ParamValidationErrors from '../error/controller/ParamValidationErrors.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import errorIsRescuableHttpError from '../helpers/error/errorIsRescuableHttpError.js';
 import PsychicApp from '../psychic-app/index.js';
 import { applyResourceAction, applyResourcesAction, lookupControllerOrFail, routePath, } from '../router/helpers.js';
 import RouteManager from './route-manager.js';
 import { ResourceMethods, ResourcesMethods, } from './types.js';
-import ParamValidationErrors from '../error/controller/ParamValidationErrors.js';
-import ParamValidationError from '../error/controller/ParamValidationError.js';
 export default class PsychicRouter {
     app;
     config;
@@ -95,7 +95,7 @@ export default class PsychicRouter {
         });
         const currentNamespace = replacedNamespaces[replacedNamespaces.length - 1];
         if (!currentNamespace)
-            throw new Error('Must be within a resource to call the collection method');
+            throw new Error('Must be within a `resources` declaration to call the collection method');
         cb(nestedRouter);
     }
     makeResource(path, optionsOrCb, cb, plural) {
@@ -188,9 +188,8 @@ export default class PsychicRouter {
         }
         catch (error) {
             const err = error;
-            const psychicApp = PsychicApp.getOrFail();
             if (!EnvInternal.isTest)
-                psychicApp.logger.error(err.message);
+                PsychicApp.logWithLevel('error', err.message);
             if (errorIsRescuableHttpError(err)) {
                 const httpErr = err;
                 if (httpErr.data) {

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

@@ -3,6 +3,8 @@ import ParamValidationError from '../error/controller/ParamValidationError.js';
 import ParamValidationErrors from '../error/controller/ParamValidationErrors.js';
 import isUuid from '../helpers/isUuid.js';
 import { isObject } from '../helpers/typechecks.js';
+import isArrayParamName from '../helpers/isArrayParamName.js';
+import alternateParamName from '../helpers/alternateParamName.js';
 export default class Params {
     $params;
     /**
@@ -168,8 +170,12 @@ export default class Params {
      * Params.cast(this.params.stuff, 'string', { enum: ['chalupas', 'other'] })
      * ```
      */
-    static cast(params, paramName, expectedType, opts) {
-        const param = params[paramName];
+    static cast(_params, paramName, expectedType, opts) {
+        const params = _params;
+        let param = params[paramName];
+        if (param === undefined && isArrayParamName(expectedType)) {
+            param = params[alternateParamName(paramName)];
+        }
         return new this(params).cast(paramName, typeof param === 'string' ? param.trim() : param, expectedType, opts);
     }
     static casing(params, casing) {

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

@@ -1,28 +1,9 @@
-import { DreamSerializer, SerializableDreamClassOrViewModelClass } from '@rvoh/dream';
+import { DreamSerializable, DreamSerializableArray } from '@rvoh/dream';
 import { OpenapiEndpointRendererOpts } from '../openapi-renderer/endpoint.js';
 export declare function BeforeAction(opts?: {
     isStatic?: boolean;
     only?: string[];
     except?: string[];
 }): any;
-/**
- * Used to annotate your controller method in a way that enables
- * Psychic to automatically generate an openapi spec for you. Using
- * this feature, you can easily document your api in typescript, taking
- * advantage of powerful type completion and validation, as well as useful
- * shorthand notation to keep annotations simple when possible.
- *
- * @param modelOrSerializer - a function which immediately returns either a serializer class, a dream model class, or else something that has a serializers getter on it.
- * @param body - Optional. The shape of the request body
- * @param headers - Optional. The list of request headers to provide for this endpoint
- * @param many - Optional. whether or not to render a top level array for this serializer
- * @param method - The HTTP method to use when hitting this endpoint
- * @param path - Optional. If passed, this path will be used as the request path. If not, it will be looked up in the conf/routes.ts file.
- * @param query - Optional. A list of query params to provide for this endpoint
- * @param responses - Optional. A list of additional responses that your app may return
- * @param serializerKey - Optional. Use this to override the serializer key to use when looking up a serializer by the provided model or view model.
- * @param status - Optional. The status code this endpoint uses when responding successfully. If not passed, 200 is assummed.
- * @param tags - Optional. string array
- * @param uri - Optional. A list of uri segments that this endpoint uses
- */
-export declare function OpenAPI<I extends SerializableDreamClassOrViewModelClass | SerializableDreamClassOrViewModelClass[] | typeof DreamSerializer>(modelOrSerializer?: I | OpenapiEndpointRendererOpts<I>, opts?: OpenapiEndpointRendererOpts<I>): any;
+export declare function OpenAPI<const I extends DreamSerializable | DreamSerializableArray>(modelOrSerializer: I, opts?: OpenapiEndpointRendererOpts<I>): any;
+export declare function OpenAPI(modelOrSerializer?: OpenapiEndpointRendererOpts): any;

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

@@ -0,0 +1,7 @@
+import { ViewModelClass } from '@rvoh/dream';
+export default class OpenApiDecoratorModelMissingSerializer extends Error {
+    private modelClass;
+    private serializerKey;
+    constructor(modelClass: ViewModelClass, serializerKey: string);
+    get message(): string;
+}

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

@@ -0,0 +1,6 @@
+import { ViewModelClass } from '@rvoh/dream';
+export default class OpenApiDecoratorModelMissingSerializerGetter extends Error {
+    private modelClass;
+    constructor(modelClass: ViewModelClass);
+    get message(): string;
+}

package/dist/types/src/helpers/alternateParamName.d.ts

@@ -0,0 +1 @@
+export default function alternateParamName(paramName: any): string;

package/dist/types/src/helpers/isArrayParamName.d.ts

@@ -0,0 +1 @@
+export default function isArrayParamName(paramName: any): boolean;

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

@@ -1,10 +1,10 @@
-import { Dream, DreamSerializer, OpenapiAllTypes, OpenapiFormats, OpenapiSchemaArray, OpenapiSchemaBody, OpenapiSchemaBodyShorthand, OpenapiSchemaExpressionAllOf, OpenapiSchemaExpressionAnyOf, OpenapiSchemaExpressionOneOf, OpenapiSchemaExpressionRef, OpenapiSchemaObject, OpenapiSchemaProperties, SerializableDreamClassOrViewModelClass } from '@rvoh/dream';
+import { Dream, DreamOrViewModelClassSerializerArrayKeys, DreamOrViewModelClassSerializerKey, DreamSerializable, DreamSerializableArray, OpenapiAllTypes, OpenapiFormats, OpenapiSchemaArray, OpenapiSchemaBody, OpenapiSchemaBodyShorthand, OpenapiSchemaExpressionAllOf, OpenapiSchemaExpressionAnyOf, OpenapiSchemaExpressionOneOf, OpenapiSchemaExpressionRef, OpenapiSchemaObject, OpenapiSchemaProperties, ViewModelClass } from '@rvoh/dream';
 import PsychicController from '../controller/index.js';
 import { HttpStatusCode, HttpStatusCodeNumber } from '../error/http/status-codes.js';
 import { RouteConfig } from '../router/route-manager.js';
 import { HttpMethod } from '../router/types.js';
 import { OpenapiBodySegment } from './body-segment.js';
-export default class OpenapiEndpointRenderer<DreamsOrSerializersOrViewModels extends SerializableDreamClassOrViewModelClass | SerializableDreamClassOrViewModelClass[] | typeof DreamSerializer | (typeof DreamSerializer)[]> {
+export default class OpenapiEndpointRenderer<DreamsOrSerializersOrViewModels extends DreamSerializable | DreamSerializableArray> {
     private dreamsOrSerializers;
     private controllerClass;
     private action;
@@ -224,6 +224,8 @@ export default class OpenapiEndpointRenderer<DreamsOrSerializersOrViewModels ext
      * match.
      */
     private getSerializerClasses;
+    private expandStiSerializersInDreamsOrSerializers;
+    private expandDreamStiClasses;
     /**
      * @internal
      *
@@ -245,11 +247,7 @@ export declare class MissingControllerActionPairingInRoutes extends Error {
     constructor(controllerClass: typeof PsychicController, action: string);
     get message(): string;
 }
-export interface OpenapiEndpointRendererOpts<T extends SerializableDreamClassOrViewModelClass | SerializableDreamClassOrViewModelClass[] | typeof DreamSerializer | (typeof DreamSerializer)[], NonArrayT extends T extends (infer R extends abstract new (...args: any) => any)[] ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-R & (abstract new (...args: any) => any) : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-T & (abstract new (...args: any) => any) = T extends (infer R extends abstract new (...args: any) => any)[] ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-R & (abstract new (...args: any) => any) : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-T & (abstract new (...args: any) => any)> {
+export interface OpenapiEndpointRendererOpts<I extends DreamSerializable | DreamSerializableArray | undefined = undefined> {
     many?: boolean;
     pathParams?: OpenapiPathParams;
     headers?: OpenapiHeaders;
@@ -265,11 +263,7 @@ T & (abstract new (...args: any) => any)> {
         description: string;
     }>>;
     defaultResponse?: OpenapiEndpointRendererDefaultResponseOption;
-    serializerKey?: InstanceType<NonArrayT> extends {
-        serializers: {
-            [key: string]: typeof DreamSerializer;
-        };
-    } ? string : undefined;
+    serializerKey?: I extends undefined ? never : I extends DreamSerializableArray ? DreamOrViewModelClassSerializerArrayKeys<I> : I extends typeof Dream | ViewModelClass ? DreamOrViewModelClassSerializerKey<I> : never;
     status?: HttpStatusCodeNumber;
     omitDefaultHeaders?: boolean;
     omitDefaultResponses?: boolean;

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

@@ -46,7 +46,7 @@ export default class Params {
      * Params.cast(this.params.stuff, 'string', { enum: ['chalupas', 'other'] })
      * ```
      */
-    static cast<const EnumType extends readonly string[], OptsType extends ParamsCastOptions<EnumType>, ExpectedType extends (typeof PsychicParamsPrimitiveLiterals)[number] | RegExp, ValidatedType extends ValidatedReturnType<ExpectedType, OptsType>, AllowNullOrUndefined extends ValidatedAllowsNull<ExpectedType, OptsType>, FinalReturnType extends AllowNullOrUndefined extends true ? ValidatedType | null | undefined : ValidatedType>(params: object, paramName: string, expectedType: ExpectedType, opts?: OptsType): FinalReturnType;
+    static cast<const EnumType extends readonly string[], OptsType extends ParamsCastOptions<EnumType>, ExpectedType extends (typeof PsychicParamsPrimitiveLiterals)[number] | RegExp, ValidatedType extends ValidatedReturnType<ExpectedType, OptsType>, AllowNullOrUndefined extends ValidatedAllowsNull<ExpectedType, OptsType>, FinalReturnType extends AllowNullOrUndefined extends true ? ValidatedType | null | undefined : ValidatedType>(_params: object, paramName: string, expectedType: ExpectedType, opts?: OptsType): FinalReturnType;
     static casing<T extends typeof Params>(this: T, params: object, casing: 'snake' | 'camel'): Params;
     private _casing;
     constructor($params: object);

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^0.39.0",
+    "@rvoh/dream": "^0.42.0",
     "@rvoh/dream-spec-helpers": "^0.2.4",
     "@rvoh/psychic-spec-helpers": "^0.6.0",
     "@types/express": "^5.0.1",