@rvoh/psychic 3.0.0-alpha.7 → 3.0.0

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

@@ -22,6 +22,9 @@ ${INDENT}    - citext:
 ${INDENT}    - citext[]:
 ${INDENT}        case insensitive text (indexes and queries are automatically case insensitive)
 ${INDENT}
+${INDENT}    - encrypted:
+${INDENT}        encrypted text (used in conjunction with the @deco.Encrypted decorator)
+${INDENT}
 ${INDENT}    - string:
 ${INDENT}    - string[]:
 ${INDENT}        varchar; allowed length defaults to 255, but may be customized, e.g.: subtitle:string:128 or subtitle:string:128:optional
@@ -83,8 +86,9 @@ export default class PsychicCLI {
                               - update
                               - delete`)
             .option('--sti-base-serializer', 'omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
-            .option('--owning-model <modelName>', 'the model class of the object that `associationQuery`/`createAssociation` will be performed on in the created controller and spec (e.g., "Host", "Guest", "Ticketing/Ticket") (simply to save time making changes to the generated code). Defaults to User')
+            .option('--owning-model <modelName>', 'the model class of the object that `associationQuery`/`createAssociation` will be performed on in the created controller and spec (e.g., "Host", "Guest", "Ticketing/Ticket"). Defaults to the current user for non-admin/internal namespaced controllers. For admin/internal namespaced controllers, this defaults to null, meaning every admin/internal user can access the model.')
             .option('--connection-name <connectionName>', 'the name of the db connection you would like to use for your model. Defaults to "default"', 'default')
+            .option('--model-name <modelName>', 'explicit model class name to use instead of the auto-generated one (e.g. --model-name=Kitchen for Room/Kitchen)')
             .argument('<path>', 'URL path from root domain. Specify nesting resource with `{}`, e.g.: `tickets/{}/comments`')
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', columnsWithTypesDescription)

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

@@ -796,7 +796,7 @@ export default class PsychicController {
      * ```
      */
     redirect(path) {
-        this.ctx.redirect(path);
+        this.koaRedirect(302, path);
     }
     // begin: http status codes
     /**

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

@@ -19,11 +19,12 @@ export default async function generateController({ fullyQualifiedControllerName,
     fullyQualifiedControllerName = fullyQualifiedControllerName.replace(pathParamRegexp, '/');
     const allControllerNameParts = fullyQualifiedControllerName.split('/');
     const forAdmin = allControllerNameParts[0] === 'Admin';
-    const controllerNameParts = forAdmin ? [allControllerNameParts.shift()] : [];
+    const forInternal = allControllerNameParts[0] === 'Internal';
+    const controllerNameParts = forAdmin || forInternal ? [allControllerNameParts.shift()] : [];
     for (let index = 0; index < allControllerNameParts.length; index++) {
-        if (controllerNameParts.length > (forAdmin ? 1 : 0)) {
+        if (controllerNameParts.length > (forAdmin || forInternal ? 1 : 0)) {
             // Write the ancestor controller
-            const [baseAncestorName, baseAncestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, forAdmin, { forBaseController: true });
+            const [baseAncestorName, baseAncestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, forAdmin, forInternal, { forBaseController: true });
             if (baseAncestorName === undefined)
                 throw new UnexpectedUndefined();
             if (baseAncestorImportStatement === undefined)
@@ -38,6 +39,7 @@ export default async function generateController({ fullyQualifiedControllerName,
                     fullyQualifiedControllerName: baseControllerName,
                     omitOpenApi: true,
                     forAdmin,
+                    forInternal,
                     singular,
                 }));
             }
@@ -47,7 +49,7 @@ export default async function generateController({ fullyQualifiedControllerName,
             controllerNameParts.push(namedPart);
     }
     // Write the controller
-    const [ancestorName, ancestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, forAdmin, {
+    const [ancestorName, ancestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, forAdmin, forInternal, {
         forBaseController: false,
     });
     if (ancestorName === undefined)
@@ -66,6 +68,7 @@ export default async function generateController({ fullyQualifiedControllerName,
             actions,
             owningModel,
             forAdmin,
+            forInternal,
             singular,
         }));
     }
@@ -86,29 +89,35 @@ export default async function generateController({ fullyQualifiedControllerName,
         resourceSpecs,
         owningModel,
         forAdmin,
+        forInternal,
         singular,
         actions,
     });
 }
-function baseAncestorNameAndImport(controllerNameParts, forAdmin, { forBaseController }) {
+function baseAncestorNameAndImport(controllerNameParts, forAdmin, forInternal, { forBaseController }) {
     const maybeAncestorNameForBase = `${controllerNameParts.slice(0, controllerNameParts.length - 1).join('')}BaseController`;
     const dotFiles = forBaseController ? '..' : '.';
-    return controllerNameParts.length === (forAdmin ? 2 : 1)
+    return controllerNameParts.length === (forAdmin || forInternal ? 2 : 1)
         ? forAdmin
             ? [
                 `AdminAuthedController`,
                 `import AdminAuthedController from '${dotFiles}/${addImportSuffix('AuthedController.js')}'`,
             ]
-            : [
-                `AuthedController`,
-                `import AuthedController from '${dotFiles}/${addImportSuffix('AuthedController.js')}'`,
-            ]
+            : forInternal
+                ? [
+                    `InternalAuthedController`,
+                    `import InternalAuthedController from '${dotFiles}/${addImportSuffix('AuthedController.js')}'`,
+                ]
+                : [
+                    `AuthedController`,
+                    `import AuthedController from '${dotFiles}/${addImportSuffix('AuthedController.js')}'`,
+                ]
         : [
             maybeAncestorNameForBase,
             `import ${maybeAncestorNameForBase} from '${dotFiles}/${addImportSuffix('BaseController.js')}'`,
         ];
 }
-async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, owningModel, forAdmin, singular, actions, }) {
+async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, owningModel, forAdmin, forInternal, singular, actions, }) {
     const { relFilePath, absDirPath, absFilePath } = psychicFileAndDirPaths(psychicPath('controllerSpecs'), fullyQualifiedControllerName + `.spec.ts`);
     try {
         console.log(`generating controller spec: ${relFilePath}`);
@@ -121,6 +130,7 @@ async function generateControllerSpec({ fullyQualifiedControllerName, route, ful
                 columnsWithTypes,
                 owningModel,
                 forAdmin,
+                forInternal,
                 singular,
                 actions,
             })

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

@@ -13,6 +13,12 @@ export default async function addResourceToRoutes(route, options) {
         if (fsSync.existsSync(adminRoutesFilePath))
             routesFilePath = adminRoutesFilePath;
     }
+    const internalRouteRegexp = /^\/?internal/;
+    if (internalRouteRegexp.test(route)) {
+        const internalRoutesFilePath = routesFilePath.replace(/\.ts$/, '.internal.ts');
+        if (fsSync.existsSync(internalRoutesFilePath))
+            routesFilePath = internalRoutesFilePath;
+    }
     let routes = (await fs.readFile(routesFilePath)).toString();
     const results = addResourceToRoutes_routeToRegexAndReplacements(routes, route, options);
     routes = results.routes;

package/dist/cjs/src/generate/helpers/generateControllerContent.js

@@ -1,7 +1,7 @@
 import { DreamApp } from '@rvoh/dream';
 import { camelize, hyphenize } from '@rvoh/dream/utils';
 import pluralize from 'pluralize-esm';
-export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, forAdmin, singular, }) {
+export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, forAdmin, forInternal = false, singular, }) {
     fullyQualifiedControllerName = DreamApp.system.standardizeFullyQualifiedModelName(fullyQualifiedControllerName);
     const additionalImports = [];
     const controllerClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(fullyQualifiedControllerName);
@@ -22,8 +22,12 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     const defaultOpenapiSerializerKeyProperty = forAdmin
         ? `
     serializerKey: 'admin',`
-        : '';
-    const loadQueryBase = forAdmin
+        : forInternal
+            ? `
+    serializerKey: 'internal',`
+            : '';
+    const useDirectModelAccess = (forAdmin || forInternal) && !owningModel;
+    const loadQueryBase = useDirectModelAccess
         ? (modelClassName ?? 'no-class-name')
         : `this.${owningModelProperty}.associationQuery('${pluralizedModelAttributeName}')`;
     const methodDefs = actions.map(methodName => {
@@ -38,8 +42,8 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     fastJsonStringify: true,
   })
   public async create() {
-    // let ${modelAttributeName} = await ${forAdmin ? `${modelClassName}.create(` : `this.${owningModelProperty}.createAssociation('${pluralizedModelAttributeName}', `}this.paramsFor(${modelClassName}))
-    // if (${modelAttributeName}.isPersisted) ${modelAttributeName} = await ${modelAttributeName}.loadFor('${forAdmin ? 'admin' : 'default'}').execute()
+    // let ${modelAttributeName} = await ${useDirectModelAccess ? `${modelClassName}.create(` : `this.${owningModelProperty}.createAssociation('${pluralizedModelAttributeName}', `}this.paramsFor(${modelClassName}))
+    // if (${modelAttributeName}.isPersisted) ${modelAttributeName} = await ${modelAttributeName}.loadFor('${forAdmin ? 'admin' : forInternal ? 'internal' : 'default'}').execute()
     // this.created(${modelAttributeName})
   }`;
                 else
@@ -60,12 +64,12 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     tags: openApiTags,
     description: 'Paginated index of ${pluralize(modelClassName)}',
     cursorPaginate: true,
-    serializerKey: '${forAdmin ? 'adminSummary' : 'summary'}',
+    serializerKey: '${forAdmin ? 'adminSummary' : forInternal ? 'internalSummary' : 'summary'}',
     fastJsonStringify: true,
   })
   public async index() {
     // const ${pluralizedModelAttributeName} = await ${loadQueryBase}
-    //   .preloadFor('${forAdmin ? 'adminSummary' : 'summary'}')
+    //   .preloadFor('${forAdmin ? 'adminSummary' : forInternal ? 'internalSummary' : 'summary'}')
     //   .cursorPaginate({ cursor: this.castParam('cursor', 'string', { allowNull: true }) })
     // this.ok(${pluralizedModelAttributeName})
   }`;
@@ -76,7 +80,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
   //   tags: openApiTags,
   //   description: '<tbd>',
   //   many: true,
-  //   serializerKey: '${forAdmin ? 'adminSummary' : 'summary'}',
+  //   serializerKey: '${forAdmin ? 'adminSummary' : forInternal ? 'internalSummary' : 'summary'}',
   //   fastJsonStringify: true,
   // })
   public async index() {
@@ -183,22 +187,22 @@ export default function generateControllerContent({ ancestorName, ancestorImport
 ${omitOpenApi ? '' : openApiImport + '\n'}${ancestorImportStatement}${additionalImports.length ? '\n' + additionalImports.join('\n') : ''}${omitOpenApi ? '' : '\n\n' + openApiTags}
 
 export default class ${controllerClassName} extends ${ancestorName} {
-${methodDefs.join('\n\n')}${modelClassName ? privateMethods(forAdmin, modelClassName, actions, loadQueryBase, singular) : ''}
+${methodDefs.join('\n\n')}${modelClassName ? privateMethods(forAdmin, forInternal, modelClassName, actions, loadQueryBase, singular) : ''}
 }
 `;
 }
-function privateMethods(forAdmin, modelClassName, methods, loadQueryBase, singular) {
+function privateMethods(forAdmin, forInternal, modelClassName, methods, loadQueryBase, singular) {
     const privateMethods = [];
     if (methods.find(methodName => ['show', 'update', 'destroy'].includes(methodName)))
-        privateMethods.push(loadModelStatement(forAdmin, modelClassName, loadQueryBase, singular));
+        privateMethods.push(loadModelStatement(forAdmin, forInternal, modelClassName, loadQueryBase, singular));
     if (!privateMethods.length)
         return '';
     return `\n\n${privateMethods.join('\n\n')}`;
 }
-function loadModelStatement(forAdmin, modelClassName, loadQueryBase, singular) {
+function loadModelStatement(forAdmin, forInternal, modelClassName, loadQueryBase, singular) {
     return `  private async ${camelize(modelClassName)}() {
     // return await ${loadQueryBase}
-    //   .preloadFor('${forAdmin ? 'admin' : 'default'}')
+    //   .preloadFor('${forAdmin ? 'admin' : forInternal ? 'internal' : 'default'}')
     //   ${singular ? '.firstOrFail()' : ".findOrFail(this.castParam('id', 'string'))"}
   }`;
 }

package/dist/cjs/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -22,15 +22,16 @@ function createModelConfiguration(options) {
     const fullyQualifiedModelName = DreamApp.system.standardizeFullyQualifiedModelName(options.fullyQualifiedModelName);
     const modelClassName = DreamApp.system.globalClassNameFromFullyQualifiedModelName(fullyQualifiedModelName);
     const modelVariableName = camelize(modelClassName);
-    const userModelName = options.forAdmin ? 'AdminUser' : 'User';
-    const userVariableName = options.forAdmin ? 'adminUser' : 'user';
+    const userModelName = options.forInternal ? 'InternalUser' : options.forAdmin ? 'AdminUser' : 'User';
+    const userVariableName = options.forInternal ? 'internalUser' : options.forAdmin ? 'adminUser' : 'user';
     const owningModelName = options.owningModel
         ? DreamApp.system.globalClassNameFromFullyQualifiedModelName(options.owningModel)
         : userModelName;
     const owningModelVariableName = options.owningModel
         ? camelize(DreamApp.system.standardizeFullyQualifiedModelName(options.owningModel).split('/').pop())
         : userVariableName;
-    const simpleCreationCommand = `const ${modelVariableName} = await create${modelClassName}(${options.forAdmin ? '' : `{ ${owningModelVariableName} }`})`;
+    const useDirectModelAccess = (options.forAdmin || options.forInternal) && !options.owningModel;
+    const simpleCreationCommand = `const ${modelVariableName} = await create${modelClassName}(${useDirectModelAccess ? '' : `{ ${owningModelVariableName} }`})`;
     return {
         fullyQualifiedModelName,
         modelClassName,
@@ -40,6 +41,7 @@ function createModelConfiguration(options) {
         owningModelName,
         owningModelVariableName,
         simpleCreationCommand,
+        useDirectModelAccess,
     };
 }
 function createActionConfiguration(options) {
@@ -122,6 +124,7 @@ function processAttributeByType({ attributeType, attributeName, isArray, enumVal
         case 'string':
         case 'text':
         case 'citext':
+        case 'encrypted':
             processStringAttribute({
                 attributeName,
                 isArray,
@@ -264,8 +267,8 @@ describe('${fullyQualifiedControllerName}', () => {
 function generateIndexActionSpec(options) {
     if (options.actionConfig.omitIndex)
         return '';
-    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, forAdmin } = options;
-    const subjectFunctionName = `index${pluralize(modelConfig.modelClassName)}`;
+    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular } = options;
+    const subjectFunctionName = 'index';
     return `
 
   describe('GET index', () => {
@@ -283,7 +286,7 @@ function generateIndexActionSpec(options) {
           id: ${modelConfig.modelVariableName}.id,
         }),
       ])
-    })${singular || forAdmin
+    })${singular || modelConfig.useDirectModelAccess
         ? ''
         : `
 
@@ -301,8 +304,8 @@ function generateIndexActionSpec(options) {
 function generateShowActionSpec(options) {
     if (options.actionConfig.omitShow)
         return '';
-    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, forAdmin, attributeData } = options;
-    const subjectFunctionName = `show${modelConfig.modelClassName}`;
+    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, attributeData } = options;
+    const subjectFunctionName = 'show';
     const subjectFunction = singular
         ? `
     const ${subjectFunctionName} = async <StatusCode extends 200 | 400 | 404>(expectedStatus: StatusCode) => {
@@ -326,7 +329,7 @@ function generateShowActionSpec(options) {
           id: ${modelConfig.modelVariableName}.id,${attributeData.comparableOriginalAttributeKeyValues.length ? '\n          ' + attributeData.comparableOriginalAttributeKeyValues.join('\n          ') : ''}
         }),
       )
-    })${singular || forAdmin
+    })${singular || modelConfig.useDirectModelAccess
         ? ''
         : `
 
@@ -342,8 +345,8 @@ function generateShowActionSpec(options) {
 function generateCreateActionSpec(options) {
     if (options.actionConfig.omitCreate)
         return '';
-    const { path, pathParams, modelConfig, fullyQualifiedModelName, forAdmin, singular, attributeData } = options;
-    const subjectFunctionName = `create${modelConfig.modelClassName}`;
+    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, attributeData } = options;
+    const subjectFunctionName = 'create';
     const uuidSetup = attributeData.uuidAttributes
         .map(attrName => {
         const isArray = attributeData.uuidArrayAttributes.includes(attrName);
@@ -360,7 +363,7 @@ function generateCreateActionSpec(options) {
         ? `
       const now = DateTime.now()`
         : ''}${uuidSetup || attributeData.dateAttributeIncluded || attributeData.datetimeAttributeIncluded ? '\n' : ''}`;
-    const modelQuery = forAdmin
+    const modelQuery = modelConfig.useDirectModelAccess
         ? `${modelConfig.modelClassName}.firstOrFail()`
         : `${modelConfig.owningModelVariableName}.associationQuery('${singular ? modelConfig.modelVariableName : pluralize(modelConfig.modelVariableName)}').firstOrFail()`;
     return `
@@ -375,7 +378,7 @@ function generateCreateActionSpec(options) {
       })
     }
 
-    it('creates a ${fullyQualifiedModelName}${forAdmin ? '' : ` for this ${modelConfig.owningModelName}`}', async () => {${dateTimeSetup}
+    it('creates a ${fullyQualifiedModelName}${modelConfig.useDirectModelAccess ? '' : ` for this ${modelConfig.owningModelName}`}', async () => {${dateTimeSetup}
       const { body } = await ${subjectFunctionName}({
         ${attributeData.attributeCreationKeyValues.join('\n        ')}
       }, 201)
@@ -393,8 +396,8 @@ function generateCreateActionSpec(options) {
 function generateUpdateActionSpec(options) {
     if (options.actionConfig.omitUpdate)
         return '';
-    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, forAdmin, attributeData } = options;
-    const subjectFunctionName = `update${modelConfig.modelClassName}`;
+    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, attributeData } = options;
+    const subjectFunctionName = 'update';
     const uuidSetup = attributeData.uuidAttributes
         .map(attrName => {
         const isArray = attributeData.uuidArrayAttributes.includes(attrName);
@@ -434,7 +437,7 @@ function generateUpdateActionSpec(options) {
         data,
       })
     }`;
-    const updateContextSpec = singular || forAdmin
+    const updateContextSpec = singular || modelConfig.useDirectModelAccess
         ? ''
         : `
 
@@ -488,8 +491,8 @@ function generateUpdateActionSpec(options) {
 function generateDestroyActionSpec(options) {
     if (options.actionConfig.omitDestroy)
         return '';
-    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular, forAdmin } = options;
-    const subjectFunctionName = `destroy${modelConfig.modelClassName}`;
+    const { path, pathParams, modelConfig, fullyQualifiedModelName, singular } = options;
+    const subjectFunctionName = 'destroy';
     const subjectFunction = singular
         ? `
     const ${subjectFunctionName} = async <StatusCode extends 204 | 400 | 404>(expectedStatus: StatusCode) => {
@@ -499,7 +502,7 @@ function generateDestroyActionSpec(options) {
     const ${subjectFunctionName} = async <StatusCode extends 204 | 400 | 404>(${modelConfig.modelVariableName}: ${modelConfig.modelClassName}, expectedStatus: StatusCode) => {
       return request.delete('/${path}/{id}', expectedStatus, ${formatPathParamsWithId(pathParams, modelConfig.modelVariableName)})
     }`;
-    const destroyContextSpec = singular || forAdmin
+    const destroyContextSpec = singular || modelConfig.useDirectModelAccess
         ? ''
         : `
 

package/dist/cjs/src/generate/resource.js

@@ -17,6 +17,7 @@ export default async function generateResource({ route, fullyQualifiedModelName,
     const resourcefulActions = options.singular ? [...SINGULAR_RESOURCE_ACTIONS] : [...RESOURCE_ACTIONS];
     const onlyActions = options.only?.split(',');
     const forAdmin = /^Admin\//.test(fullyQualifiedControllerName);
+    const forInternal = /^Internal\//.test(fullyQualifiedControllerName);
     await DreamCLI.generateDream({
         fullyQualifiedModelName,
         columnsWithTypes,
@@ -24,7 +25,9 @@ export default async function generateResource({ route, fullyQualifiedModelName,
             serializer: true,
             stiBaseSerializer: options.stiBaseSerializer,
             includeAdminSerializers: forAdmin,
+            includeInternalSerializers: forInternal,
             connectionName: options.connectionName,
+            modelName: options.modelName,
         },
     });
     await generateController({

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

@@ -98,6 +98,7 @@ export default class SerializerOpenapiRenderer {
                 type: 'object',
                 required: sort(uniq(requiredProperties.map(property => this.setCase(property)))),
                 properties: sortObjectByKey(referencedSerializersAndAttributes.attributes),
+                additionalProperties: false,
             },
         };
     }

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

@@ -309,7 +309,10 @@ export default class OpenapiSegmentExpander {
             data.minProperties = objectBodySegment.minProperties;
         }
         let referencedSerializers = [];
-        if (objectBodySegment.additionalProperties) {
+        if (objectBodySegment.additionalProperties === false) {
+            data.additionalProperties = false;
+        }
+        else if (objectBodySegment.additionalProperties) {
             const results = this.recursivelyParseBody(objectBodySegment.additionalProperties);
             referencedSerializers = [...referencedSerializers, ...results.referencedSerializers];
             data.additionalProperties = results.openapi;

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

@@ -9,11 +9,9 @@ import PsychicApp from '../psychic-app/index.js';
 import openapiParamNamesForDreamClass from '../server/helpers/openapiParamNamesForDreamClass.js';
 import OpenapiSegmentExpander from './body-segment.js';
 import { DEFAULT_OPENAPI_RESPONSES } from './defaults.js';
-import cursorPaginationParamOpenapiProperty from './helpers/cursorPaginationParamOpenapiProperty.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';
 import safelyAttachCursorPaginationParamToRequestBodySegment from './helpers/safelyAttachCursorPaginationParamToRequestBodySegment.js';
 import safelyAttachPaginationParamToRequestBodySegment from './helpers/safelyAttachPaginationParamsToBodySegment.js';
 import SerializerOpenapiRenderer from './SerializerOpenapiRenderer.js';
@@ -464,37 +462,23 @@ export default class OpenapiEndpointRenderer {
     defaultRequestBody() {
         const bodyPaginationPageParam = this.paginate?.body;
         const bodyCursorPaginationParam = this.cursorPaginate?.body ?? this.scrollPaginate?.body;
+        const paramName = bodyPaginationPageParam || bodyCursorPaginationParam;
+        if (!paramName)
+            return undefined;
+        let schema = undefined;
         if (bodyPaginationPageParam) {
-            return {
-                content: {
-                    'application/json': {
-                        schema: {
-                            type: 'object',
-                            properties: {
-                                [bodyPaginationPageParam]: paginationPageParamOpenapiProperty(),
-                            },
-                        },
-                    },
-                },
-            };
+            schema = safelyAttachPaginationParamToRequestBodySegment(bodyPaginationPageParam, schema);
         }
         else if (bodyCursorPaginationParam) {
-            return {
-                content: {
-                    'application/json': {
-                        schema: {
-                            type: 'object',
-                            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                            properties: {
-                                [bodyCursorPaginationParam]: cursorPaginationParamOpenapiProperty(),
-                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            },
-                        },
-                    },
-                },
-            };
+            schema = safelyAttachCursorPaginationParamToRequestBodySegment(bodyCursorPaginationParam, schema);
         }
-        return undefined;
+        return {
+            content: {
+                'application/json': {
+                    schema: schema,
+                },
+            },
+        };
     }
     /**
      * @internal

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

@@ -1,8 +1,9 @@
 import cursorPaginationParamOpenapiProperty from './cursorPaginationParamOpenapiProperty.js';
+import { safelyAttachParamToRequestBodySegment } from './safelyAttachPaginationParamsToBodySegment.js';
 /**
  * @internal
  *
- * Used to carefully bind implicit pagination params
+ * Used to carefully bind implicit cursor pagination params
  * to the requestBody properties. It will not apply
  * the pagination param unless the provided bodySegment
  * is:
@@ -14,18 +15,5 @@ import cursorPaginationParamOpenapiProperty from './cursorPaginationParamOpenapi
  * what was given to it, without any modifications
  */
 export default function safelyAttachCursorPaginationParamToRequestBodySegment(paramName, bodySegment) {
-    bodySegment ||= {
-        type: 'object',
-        properties: {},
-    };
-    if (bodySegment.type === 'object') {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        ;
-        bodySegment.properties = {
-            ...bodySegment.properties,
-            [paramName]: cursorPaginationParamOpenapiProperty(),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        };
-    }
-    return bodySegment;
+    return safelyAttachParamToRequestBodySegment(paramName, cursorPaginationParamOpenapiProperty(), bodySegment);
 }

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

@@ -14,15 +14,28 @@ import paginationPageParamOpenapiProperty from './paginationPageParamOpenapiProp
  * what was given to it, without any modifications
  */
 export default function safelyAttachPaginationParamToRequestBodySegment(paramName, bodySegment) {
+    return safelyAttachParamToRequestBodySegment(paramName, paginationPageParamOpenapiProperty(), bodySegment);
+}
+/**
+ * @internal
+ *
+ * Generic version: attaches any OpenAPI property definition to a body segment.
+ */
+export function safelyAttachParamToRequestBodySegment(paramName, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+property, bodySegment) {
     bodySegment ||= {
         type: 'object',
         properties: {},
     };
     if (bodySegment.type === 'object') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         ;
         bodySegment.properties = {
             ...bodySegment.properties,
-            [paramName]: paginationPageParamOpenapiProperty(),
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            [paramName]: property,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         };
     }
     return bodySegment;

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

@@ -58,13 +58,14 @@ function inferControllerOrFail(filteredNamespaces, opts) {
         });
     return controller;
 }
-export function applyResourcesAction(path, action, routingMechanism, options) {
+export function applyResourcefulAction(path, action, routingMechanism, options, plural) {
     const controller = options?.controller ||
         lookupControllerOrFail(routingMechanism, {
             path: action,
             httpMethod: httpMethodFromResourcefulAction(action),
             resourceName: path,
         });
+    const memberPath = plural ? `${path}/:id` : path;
     switch (action) {
         case 'index':
             routingMechanism.get(path, controller, 'index');
@@ -73,41 +74,24 @@ export function applyResourcesAction(path, action, routingMechanism, options) {
             routingMechanism.post(path, controller, 'create');
             break;
         case 'update':
-            routingMechanism.put(`${path}/:id`, controller, 'update');
-            routingMechanism.patch(`${path}/:id`, controller, 'update');
+            routingMechanism.put(memberPath, controller, 'update');
+            routingMechanism.patch(memberPath, controller, 'update');
             break;
         case 'show':
-            routingMechanism.get(`${path}/:id`, controller, 'show');
+            routingMechanism.get(memberPath, controller, 'show');
             break;
         case 'destroy':
-            routingMechanism.delete(`${path}/:id`, controller, 'destroy');
+            routingMechanism.delete(memberPath, controller, 'destroy');
             break;
     }
 }
+/** @deprecated Use applyResourcefulAction with plural parameter instead */
+export function applyResourcesAction(path, action, routingMechanism, options) {
+    return applyResourcefulAction(path, action, routingMechanism, options, true);
+}
+/** @deprecated Use applyResourcefulAction with plural parameter instead */
 export function applyResourceAction(path, action, routingMechanism, options) {
-    const controller = options?.controller ||
-        lookupControllerOrFail(routingMechanism, {
-            path: action,
-            httpMethod: httpMethodFromResourcefulAction(action),
-            resourceName: path,
-        });
-    switch (action) {
-        case 'create':
-            routingMechanism.post(path, controller, 'create');
-            break;
-        case 'update':
-            routingMechanism.put(path, controller, 'update');
-            routingMechanism.patch(path, controller, 'update');
-            break;
-        case 'show':
-            routingMechanism.get(path, controller, 'show');
-            break;
-        case 'destroy':
-            routingMechanism.delete(path, controller, 'destroy');
-            break;
-        default:
-            throw new Error(`unsupported resource method type: ${action}`);
-    }
+    return applyResourcefulAction(path, action, routingMechanism, options, false);
 }
 /**
  * Converts OpenAPI-style route parameters to Express.js-style parameters

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

@@ -10,7 +10,7 @@ import CannotCommitRoutesWithoutKoaApp from '../error/router/cannot-commit-route
 import EnvInternal from '../helpers/EnvInternal.js';
 import errorIsRescuableHttpError from '../helpers/error/errorIsRescuableHttpError.js';
 import PsychicApp from '../psychic-app/index.js';
-import { applyResourceAction, applyResourcesAction, convertRouteParams, lookupControllerOrFail, routePath, } from '../router/helpers.js';
+import { applyResourcefulAction, convertRouteParams, lookupControllerOrFail, routePath, } from '../router/helpers.js';
 import RouteManager from './route-manager.js';
 import { ResourceMethods, ResourcesMethods, } from './types.js';
 const ERROR_LOGGING_DEPTH = 6;
@@ -170,12 +170,7 @@ suggested fix:  "${convertRouteParams(path)}"
         this.runNestedCallbacks(path, nestedRouter, cb, { asMember: plural, resourceful: true });
         this.currentNamespaces = originalCurrentNamespaces;
         resourceMethods.forEach(action => {
-            if (plural) {
-                applyResourcesAction(path, action, nestedRouter, options);
-            }
-            else {
-                applyResourceAction(path, action, nestedRouter, options);
-            }
+            applyResourcefulAction(path, action, nestedRouter, options, plural);
         });
     }
     runNestedCallbacks(namespace, nestedRouter, cb, { asMember = false, resourceful = false, treatNamespaceAsScope = false, } = {}) {