@rvoh/psychic 1.10.4 → 1.11.0-beta.1

package/dist/cjs/src/bin/helpers/enumsFileStr.js

@@ -20,6 +20,7 @@ export const ${exportedTypeName} = [
             .map(val => `'${val}'`)
             .join(',\n  ')}
 ] as const
+export type ${exportedTypeName.replace(/Values^/, '')} = (typeof ${exportedTypeName})[number]
 
 `;
     });

package/dist/cjs/src/cli/helpers/PsychicLogos.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const colorize_js_1 = __importDefault(require("./colorize.js"));
+class PsychicLogos {
+    static babyAster() {
+        const g = (str) => (0, colorize_js_1.default)(str, { color: 'green' });
+        return `
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+░░░░░░█▀█░█▀▀░█░█░█▀▀░█░█░▀█▀░█▀▀░░░░░░░░░
+░░░░░░█▀▀░▀▀█░░█░░█░░░█▀█░░█░░█░░░░░░░░░░░
+░░░░░░▀░░░▀▀▀░░▀░░▀▀▀░▀░▀░▀▀▀░▀▀▀░░░░░░░░░
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⠟⢉⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⣀⡀⠈⠻⠿⡿⠿⠛⠉⠁⢠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠹⠀⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⣿⣿⣿⣿⣿⣿⣿⣿⠟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⣿⠿⠛⠋⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢴⣲⠀⠀⠀⠋⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣤⡀⠀⢀⣠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿
+⠀⠀⠀⠀⠀⠀⣀⠀⠀⠀⠀⠀⠀⠀⢸▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓
+⠀⠀⠀⠀⢠▓⣿⠀⠀⠀⣿ ⠀ ⣸⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿
+⠀⠀⠀⢠▓⣿▓⣦⠀⠀⣿▓⠀⠀⠋▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓
+⠀⠀⠀⢸⣿▓⣿▓⡄⠀⠈⠙⣄⣀⣠⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿
+⠀⠀⠀⠺▓⣿▓⣿▓⣄⣀⣤⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓⣿▓\
+`.replace(/▓/g, g('▓'));
+    }
+}
+exports.default = PsychicLogos;

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

@@ -72,7 +72,7 @@ class PsychicCLI {
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', columnsWithTypesDescription)
             .action(async (route, modelName, columnsWithTypes, options) => {
-            await initializePsychicApp();
+            await initializePsychicApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.generateResource(route, modelName, columnsWithTypes, options);
             process.exit();
         });
@@ -83,7 +83,7 @@ class PsychicCLI {
             .argument('<controllerName>', 'the name of the controller to create, including namespaces, e.g. Posts or Api/V1/Posts')
             .argument('[actions...]', 'the names of controller actions to create')
             .action(async (controllerName, actions) => {
-            await initializePsychicApp();
+            await initializePsychicApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.generateController(controllerName, actions);
             process.exit();
         });
@@ -140,7 +140,7 @@ class PsychicCLI {
             .description('sync introspects your database, updating your schema to reflect, and then syncs the new schema with the installed dream node module, allowing it provide your schema to the underlying kysely integration')
             .option('--schema-only')
             .action(async (options = {}) => {
-            await initializePsychicApp();
+            await initializePsychicApp({ bypassDreamIntegrityChecks: !!options.schemaOnly });
             await index_js_1.default.sync(options);
             process.exit();
         });
@@ -149,7 +149,7 @@ class PsychicCLI {
             .description('watches your app for changes, and re-syncs any time they happen')
             .argument('[dir]', 'the folder you want to watch, defaults to ./src')
             .action(async (dir) => {
-            await initializePsychicApp();
+            await initializePsychicApp({ bypassDreamIntegrityChecks: true });
             Watcher_js_1.default.watch(dir);
         });
         program

package/dist/cjs/src/controller/helpers/httpMethodColor.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = httpMethodColor;
+exports.httpMethodBgColor = httpMethodBgColor;
+function httpMethodColor(httpMethod) {
+    switch (httpMethod) {
+        case 'delete':
+            return 'red';
+        case 'options':
+            return 'gray';
+        case 'patch':
+        case 'put':
+            return 'magentaBright';
+        case 'post':
+            return 'greenBright';
+        default:
+            return 'blue';
+    }
+}
+function httpMethodBgColor(httpMethod) {
+    switch (httpMethod) {
+        case 'delete':
+            return 'bgRed';
+        case 'options':
+            return 'bgWhite';
+        case 'patch':
+        case 'put':
+            return 'bgMagentaBright';
+        case 'post':
+            return 'bgGreen';
+        default:
+            return 'bgBlue';
+    }
+}

package/dist/cjs/src/controller/helpers/logIfDevelopment.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = logIfDevelopment;
+const dream_1 = require("@rvoh/dream");
+const colorize_js_1 = __importDefault(require("../../cli/helpers/colorize.js"));
+const EnvInternal_js_1 = __importDefault(require("../../helpers/EnvInternal.js"));
+const httpMethodColor_js_1 = require("./httpMethodColor.js");
+const statusCodeColor_js_1 = require("./statusCodeColor.js");
+function logIfDevelopment({ req, res, startTime, fallbackStatusCode = 200, }) {
+    if (!EnvInternal_js_1.default.isDevelopment)
+        return;
+    const method = (0, colorize_js_1.default)(` ${req.method.toUpperCase()} `, {
+        color: 'black',
+        bgColor: (0, httpMethodColor_js_1.httpMethodBgColor)(req.method.toLowerCase()),
+    });
+    const computedStatus = res.statusCode || fallbackStatusCode;
+    const statusBgColor = (0, statusCodeColor_js_1.statusCodeBgColor)(computedStatus);
+    const status = (0, colorize_js_1.default)(` ${computedStatus} `, {
+        color: 'black',
+        bgColor: statusBgColor,
+    });
+    const url = (0, colorize_js_1.default)(req.url, { color: 'green' });
+    const benchmark = (0, colorize_js_1.default)(`${Date.now() - startTime}ms`, { color: 'gray' });
+    dream_1.DreamCLI.logger.log(`${method} ${url} ${status} ${benchmark}`, { logPrefix: '' });
+}

package/dist/cjs/src/controller/helpers/statusCodeColor.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = statusCodeColor;
+exports.statusCodeBgColor = statusCodeBgColor;
+function statusCodeColor(statusCode) {
+    if (statusCode >= 200 && statusCode < 300)
+        return 'green';
+    if (statusCode >= 300 && statusCode < 400)
+        return 'yellow';
+    if (statusCode >= 400 && statusCode < 500)
+        return 'red';
+    return 'redBright';
+}
+function statusCodeBgColor(statusCode) {
+    if (statusCode >= 200 && statusCode < 300)
+        return 'bgGreen';
+    if (statusCode >= 300 && statusCode < 400)
+        return 'bgYellow';
+    if (statusCode >= 400 && statusCode < 500)
+        return 'bgRed';
+    return 'bgRedBright';
+}

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

@@ -43,7 +43,9 @@ const index_js_1 = __importDefault(require("../psychic-app/index.js"));
 const params_js_1 = __importDefault(require("../server/params.js"));
 const index_js_2 = __importDefault(require("../session/index.js"));
 const isPaginatedResult_js_1 = __importDefault(require("./helpers/isPaginatedResult.js"));
+const logIfDevelopment_js_1 = __importDefault(require("./helpers/logIfDevelopment.js"));
 const renderDreamOrViewModel_js_1 = __importDefault(require("./helpers/renderDreamOrViewModel.js"));
+const EnvInternal_js_1 = __importDefault(require("../helpers/EnvInternal.js"));
 exports.PsychicParamsPrimitiveLiterals = [
     'bigint',
     'bigint[]',
@@ -177,7 +179,9 @@ class PsychicController {
     session;
     action;
     renderOpts;
+    startTime;
     constructor(req, res, { action, }) {
+        this.startTime = Date.now();
         this.req = req;
         this.res = res;
         this.session = new index_js_2.default(req, res);
@@ -428,7 +432,26 @@ class PsychicController {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data) {
         this.validateOpenapiResponseBody(data);
-        this.res.type('json').send((0, toJson_js_1.default)(data, index_js_1.default.getOrFail().sanitizeResponseJson));
+        this.expressSendJson(data);
+    }
+    expressSendJson(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data, statusCode = this.res.statusCode) {
+        this.res.type('json').status(statusCode).send((0, toJson_js_1.default)(data, index_js_1.default.getOrFail().sanitizeResponseJson));
+        this.logIfDevelopment();
+    }
+    expressSendStatus(statusCode) {
+        this.res.sendStatus(statusCode);
+        this.logIfDevelopment();
+    }
+    expressRedirect(statusCode, newLocation) {
+        this.res.redirect(statusCode, newLocation);
+        this.logIfDevelopment();
+    }
+    logIfDevelopment() {
+        if (!EnvInternal_js_1.default.isDevelopment)
+            return;
+        (0, logIfDevelopment_js_1.default)({ req: this.req, res: this.res, startTime: this.startTime });
     }
     defaultSerializerPassthrough = {};
     serializerPassthrough(passthrough) {
@@ -475,15 +498,15 @@ class PsychicController {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     nonAuthoritativeInformation(message = undefined) {
         if (message) {
-            this.res.status(203).json(message);
+            this.expressSendJson(message, 203);
         }
         else {
-            this.res.sendStatus(203);
+            this.expressSendStatus(203);
         }
     }
     // 204
     noContent() {
-        this.res.sendStatus(204);
+        this.expressSendStatus(204);
     }
     // 205
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -499,27 +522,23 @@ class PsychicController {
     }
     // 301
     movedPermanently(newLocation) {
-        this.res.redirect(301, newLocation);
+        this.expressRedirect(301, newLocation);
     }
     // 302
     found(newLocation) {
-        this.res.redirect(302, newLocation);
+        this.expressRedirect(302, newLocation);
     }
     // 303
     seeOther(newLocation) {
-        this.res.redirect(303, newLocation);
-    }
-    // 304
-    notModified(newLocation) {
-        this.res.redirect(304, newLocation);
+        this.expressRedirect(303, newLocation);
     }
     // 307
     temporaryRedirect(newLocation) {
-        this.res.redirect(307, newLocation);
+        this.expressRedirect(307, newLocation);
     }
     // 308
     permanentRedirect(newLocation) {
-        this.res.redirect(308, newLocation);
+        this.expressRedirect(308, newLocation);
     }
     // 400
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateResourceControllerSpecContent;
 const dream_1 = require("@rvoh/dream");
+const addImportSuffix_js_1 = __importDefault(require("../../helpers/path/addImportSuffix.js"));
 const relativePsychicPath_js_1 = __importDefault(require("../../helpers/path/relativePsychicPath.js"));
 const updirsFromPath_js_1 = __importDefault(require("../../helpers/path/updirsFromPath.js"));
 const index_js_1 = require("../../index.js");
-const addImportSuffix_js_1 = __importDefault(require("../../helpers/path/addImportSuffix.js"));
 function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, forAdmin, singular, actions, }) {
     fullyQualifiedModelName = (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedModelName);
     const modelClassName = (0, dream_1.globalClassNameFromFullyQualifiedModelName)(fullyQualifiedModelName);
@@ -21,7 +21,7 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
         ? (0, dream_1.globalClassNameFromFullyQualifiedModelName)(owningModel)
         : userModelName;
     const owningModelVariableName = owningModelName ? (0, dream_1.camelize)(owningModelName) : userVariableName;
-    const dreamImports = ['UpdateableProperties'];
+    const dreamImports = [];
     const importStatements = (0, dream_1.compact)([
         importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModel(fullyQualifiedControllerName, userModelName),
@@ -34,7 +34,6 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     const attributeCreationKeyValues = [];
     const attributeUpdateKeyValues = [];
     const comparableOriginalAttributeKeyValues = [];
-    const comparableUpdatedAttributeKeyValues = [];
     const expectEqualOriginalValue = [];
     const expectEqualUpdatedValue = [];
     const expectEqualOriginalNamedVariable = [];
@@ -43,89 +42,88 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     let dateAttributeIncluded = false;
     let datetimeAttributeIncluded = false;
     for (const attribute of columnsWithTypes) {
-        const [rawAttributeName, attributeType, , enumValues] = attribute.split(':');
+        const [rawAttributeName, rawAttributeType, , enumValues] = attribute.split(':');
         if (/(_type|_id)$/.test(rawAttributeName ?? ''))
             continue;
         const attributeName = (0, dream_1.camelize)(rawAttributeName ?? '');
         const dotNotationVariable = `${modelVariableName}.${attributeName}`;
+        if (!rawAttributeType)
+            continue;
+        const arrayBracketRegexp = /\[\]$/;
+        const isArray = arrayBracketRegexp.test(rawAttributeType);
+        const attributeType = rawAttributeType.replace(arrayBracketRegexp, '');
         if (attributeName === 'deletedAt')
             continue;
         switch (attributeType) {
             case 'enum': {
-                const originalEnumValue = (enumValues ?? '').split(',').at(0);
-                const updatedEnumValue = (enumValues ?? '').split(',').at(-1);
-                attributeCreationKeyValues.push(`${attributeName}: '${originalEnumValue}',`);
-                attributeUpdateKeyValues.push(`${attributeName}: '${updatedEnumValue}',`);
+                const rawOriginalEnumValue = (enumValues ?? '').split(',').at(0);
+                const rawUpdatedEnumValue = (enumValues ?? '').split(',').at(-1);
+                const originalEnumValue = isArray ? [rawOriginalEnumValue] : rawOriginalEnumValue;
+                const updatedEnumValue = isArray ? [rawUpdatedEnumValue] : rawUpdatedEnumValue;
+                attributeCreationKeyValues.push(`${attributeName}: ${jsonify(originalEnumValue)},`);
+                attributeUpdateKeyValues.push(`${attributeName}: ${jsonify(updatedEnumValue)},`);
                 comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable},`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: '${updatedEnumValue}',`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual('${originalEnumValue}')`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual('${updatedEnumValue}')`);
+                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(originalEnumValue)})`);
+                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(updatedEnumValue)})`);
                 break;
             }
             case 'string':
             case 'text':
             case 'citext': {
-                const originalStringValue = `The ${fullyQualifiedModelName} ${attributeName}`;
-                const updatedStringValue = `Updated ${fullyQualifiedModelName} ${attributeName}`;
-                attributeCreationKeyValues.push(`${attributeName}: '${originalStringValue}',`);
-                attributeUpdateKeyValues.push(`${attributeName}: '${updatedStringValue}',`);
+                const rawOriginalStringValue = `The ${fullyQualifiedModelName} ${attributeName}`;
+                const rawUpdatedStringValue = `Updated ${fullyQualifiedModelName} ${attributeName}`;
+                const originalStringValue = isArray ? [rawOriginalStringValue] : rawOriginalStringValue;
+                const updatedStringValue = isArray ? [rawUpdatedStringValue] : rawUpdatedStringValue;
+                attributeCreationKeyValues.push(`${attributeName}: ${jsonify(originalStringValue)},`);
+                attributeUpdateKeyValues.push(`${attributeName}: ${jsonify(updatedStringValue)},`);
                 comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable},`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: '${updatedStringValue}',`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual('${originalStringValue}')`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual('${updatedStringValue}')`);
+                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(originalStringValue)})`);
+                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(updatedStringValue)})`);
                 break;
             }
             case 'integer':
-                attributeCreationKeyValues.push(`${attributeName}: 1,`);
-                attributeUpdateKeyValues.push(`${attributeName}: 2,`);
-                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable},`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: 2,`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual(1)`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual(2)`);
-                break;
-            case 'bigint':
-                attributeCreationKeyValues.push(`${attributeName}: '11111111111111111',`);
-                attributeUpdateKeyValues.push(`${attributeName}: '22222222222222222',`);
-                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable},`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: '22222222222222222',`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual('11111111111111111')`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual('22222222222222222')`);
-                break;
             case 'decimal':
-                attributeCreationKeyValues.push(`${attributeName}: 1.1,`);
-                attributeUpdateKeyValues.push(`${attributeName}: 2.2,`);
+            case 'bigint': {
+                const rawOriginalValue = attributeType === 'integer' ? 1 : attributeType === 'decimal' ? 1.1 : '11111111111111111';
+                const rawUpdatedValue = attributeType === 'integer' ? 2 : attributeType === 'decimal' ? 2.2 : '22222222222222222';
+                const originalValue = isArray ? [rawOriginalValue] : rawOriginalValue;
+                const updatedValue = isArray ? [rawUpdatedValue] : rawUpdatedValue;
+                attributeCreationKeyValues.push(`${attributeName}: ${jsonify(originalValue)},`);
+                attributeUpdateKeyValues.push(`${attributeName}: ${jsonify(updatedValue)},`);
                 comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable},`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: 2.2,`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual(1.1)`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual(2.2)`);
+                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(originalValue)})`);
+                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqual(${jsonify(updatedValue)})`);
                 break;
-            case 'date':
+            }
+            case 'date': {
                 dreamImports.push('CalendarDate');
                 dateAttributeIncluded = true;
-                attributeCreationKeyValues.push(`${attributeName}: today,`);
-                attributeUpdateKeyValues.push(`${attributeName}: yesterday,`);
-                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable}.toISO(),`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: yesterday.toISO(),`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqualCalendarDate(today)`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqualCalendarDate(yesterday)`);
+                attributeCreationKeyValues.push(`${attributeName}: ${isArray ? '[today.toISO()]' : 'today.toISO()'},`);
+                attributeUpdateKeyValues.push(`${attributeName}: ${isArray ? '[yesterday.toISO()]' : 'yesterday.toISO()'},`);
+                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable}${isArray ? '.map(date => date.toISO())' : '.toISO()'},`);
+                expectEqualOriginalValue.push(`expect(${dotNotationVariable}${isArray ? '[0]' : ''}).toEqualCalendarDate(today)`);
+                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}${isArray ? '[0]' : ''}).toEqualCalendarDate(yesterday)`);
                 break;
-            case 'datetime':
+            }
+            case 'datetime': {
                 dreamImports.push('DateTime');
                 datetimeAttributeIncluded = true;
-                attributeCreationKeyValues.push(`${attributeName}: now,`);
-                attributeUpdateKeyValues.push(`${attributeName}: lastHour,`);
-                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable}.toISO(),`);
-                comparableUpdatedAttributeKeyValues.push(`${attributeName}: lastHour.toISO(),`);
-                expectEqualOriginalValue.push(`expect(${dotNotationVariable}).toEqualDateTime(now)`);
-                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}).toEqualDateTime(lastHour)`);
+                attributeCreationKeyValues.push(`${attributeName}: ${isArray ? '[now.toISO()]' : 'now.toISO()'},`);
+                attributeUpdateKeyValues.push(`${attributeName}: ${isArray ? '[lastHour.toISO()]' : 'lastHour.toISO()'},`);
+                comparableOriginalAttributeKeyValues.push(`${attributeName}: ${dotNotationVariable}${isArray ? '.map(datetime => datetime.toISO())' : '.toISO()'},`);
+                expectEqualOriginalValue.push(`expect(${dotNotationVariable}${isArray ? '[0]' : ''}).toEqualDateTime(now)`);
+                expectEqualUpdatedValue.push(`expect(${dotNotationVariable}${isArray ? '[0]' : ''}).toEqualDateTime(lastHour)`);
                 break;
+            }
             default:
                 continue;
         }
         keyWithDotValue.push(`${attributeName}: ${dotNotationVariable},`);
-        const originalAttributeVariableName = 'original' + (0, dream_1.capitalize)(attributeName);
-        originalValueVariableAssignments.push(`const ${originalAttributeVariableName} = ${dotNotationVariable}`);
-        expectEqualOriginalNamedVariable.push(`expect(${dotNotationVariable}).toEqual(${originalAttributeVariableName})`);
+        if (!((attributeType === 'date' || attributeType === 'datetime') && isArray)) {
+            const originalAttributeVariableName = 'original' + (0, dream_1.capitalize)(attributeName);
+            originalValueVariableAssignments.push(`const ${originalAttributeVariableName} = ${dotNotationVariable}`);
+            expectEqualOriginalNamedVariable.push(`expect(${dotNotationVariable}).toEqual(${originalAttributeVariableName})`);
+        }
     }
     const simpleCreationCommand = `const ${modelVariableName} = await create${modelClassName}(${forAdmin ? '' : `{ ${owningModelVariableName} }`})`;
     const omitIndex = singular || !actions.includes('index');
@@ -134,7 +132,10 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     const omitUpdate = !actions.includes('update');
     const omitDestroy = !actions.includes('destroy');
     return `\
-import { ${(0, dream_1.uniq)(dreamImports).join(', ')} } from '@rvoh/dream'${(0, dream_1.uniq)(importStatements).join('')}
+import { DreamRequestAttributes } from '@rvoh/psychic-spec-helpers'${dreamImports.length
+        ? `
+import { ${(0, dream_1.uniq)(dreamImports).join(', ')} } from '@rvoh/dream'`
+        : ''}${(0, dream_1.uniq)(importStatements).join('')}
 import { session, SpecRequestType } from '${specUnitUpdirs}helpers/${(0, addImportSuffix_js_1.default)('authentication.js')}'
 
 describe('${fullyQualifiedControllerName}', () => {
@@ -219,7 +220,7 @@ describe('${fullyQualifiedControllerName}', () => {
 
   describe('POST create', () => {
     const subject = async <StatusCode extends 201 | 400>(
-      data: UpdateableProperties<${modelClassName}>,
+      data: DreamRequestAttributes<${modelClassName}>,
       expectedStatus: StatusCode
     ) => {
       return request.post('/${route}', expectedStatus, { data })
@@ -253,7 +254,7 @@ describe('${fullyQualifiedControllerName}', () => {
   describe('PATCH update', () => {${singular
             ? `
     const subject = async <StatusCode extends 204 | 400 | 404>(
-      data: UpdateableProperties<${modelClassName}>,
+      data: DreamRequestAttributes<${modelClassName}>,
       expectedStatus: StatusCode
     ) => {
       return request.patch('/${route}', expectedStatus, {
@@ -263,7 +264,7 @@ describe('${fullyQualifiedControllerName}', () => {
             : `
     const subject = async <StatusCode extends 204 | 400 | 404>(
       ${modelVariableName}: ${modelClassName},
-      data: UpdateableProperties<${modelClassName}>,
+      data: DreamRequestAttributes<${modelClassName}>,
       expectedStatus: StatusCode
     ) => {
       return request.patch('/${route}/{id}', expectedStatus, {
@@ -292,7 +293,13 @@ describe('${fullyQualifiedControllerName}', () => {
             : `
 
     context('a ${fullyQualifiedModelName} created by another ${owningModelName}', () => {
-      it('is not updated', async () => {
+      it('is not updated', async () => {${dateAttributeIncluded
+                ? `
+        const yesterday = CalendarDate.yesterday()`
+                : ''}${datetimeAttributeIncluded
+                ? `
+        const lastHour = DateTime.now().minus({ hour: 1 })`
+                : ''}${dateAttributeIncluded || datetimeAttributeIncluded ? '\n' : ''}
         const ${modelVariableName} = await create${modelClassName}()
         ${originalValueVariableAssignments.length ? originalValueVariableAssignments.join('\n        ') : ''}
 
@@ -349,3 +356,7 @@ function importStatementForModel(originModelName, destinationModelName = originM
 function importStatementForModelFactory(originModelName, destinationModelName = originModelName) {
     return `\nimport create${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllerSpecs', 'factories', originModelName, destinationModelName)}'`;
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function jsonify(val) {
+    return JSON.stringify(val).replace(/"/g, "'");
+}

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

@@ -17,6 +17,8 @@ async function generateResource({ route, fullyQualifiedModelName, options, colum
     // which will exhibit bad behavior when provided with
     // a prefixing slash.
     route = route.replace(/^\/+/, '');
+    if (!options.singular)
+        route = (0, pluralize_esm_1.default)(route);
     const fullyQualifiedControllerName = (0, dream_1.standardizeFullyQualifiedModelName)(route);
     const resourcefulActions = options.singular ? [...exports.SINGULAR_RESOURCE_ACTIONS] : [...exports.RESOURCE_ACTIONS];
     const onlyActions = options.only?.split(',');
@@ -31,7 +33,6 @@ async function generateResource({ route, fullyQualifiedModelName, options, colum
             connectionName: options.connectionName,
         },
     });
-    route = (0, pluralize_esm_1.default)(route);
     await (0, controller_js_1.default)({
         fullyQualifiedControllerName,
         fullyQualifiedModelName,

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

@@ -72,11 +72,7 @@ class SerializerOpenapiRenderer {
         const requiredProperties = (0, dream_1.compact)(this.serializerBuilder['attributes'].map(attribute => {
             const attributeType = attribute.type;
             switch (attributeType) {
-                case 'attribute': {
-                    if (attribute.options?.required === false)
-                        return null;
-                    return attribute.options?.as ?? attribute.name;
-                }
+                case 'attribute':
                 case 'delegatedAttribute': {
                     if (attribute.options?.required === false)
                         return null;
@@ -119,23 +115,6 @@ class SerializerOpenapiRenderer {
             let newlyReferencedSerializers = [];
             accumulator = (() => {
                 switch (attributeType) {
-                    ////////////////
-                    // attributes //
-                    ////////////////
-                    case 'attribute': {
-                        const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
-                        const openapi = attribute.options.openapi;
-                        newlyReferencedSerializers = (0, allSerializersFromHandWrittenOpenapi_js_1.default)(openapi);
-                        accumulator[outputAttributeName] = DataTypeForOpenapi?.isDream
-                            ? (0, dreamAttributeOpenapiShape_js_1.dreamColumnOpenapiShape)(DataTypeForOpenapi, attribute.name, openapi, {
-                                suppressResponseEnums: this.suppressResponseEnums,
-                            })
-                            : (0, allSerializersToRefsInOpenapi_js_1.default)((0, openapiShorthandToOpenapi_js_1.default)(openapi));
-                        return accumulator;
-                    }
-                    /////////////////////
-                    // end: attributes //
-                    /////////////////////
                     ///////////////////////
                     // custom attributes //
                     ///////////////////////
@@ -154,19 +133,39 @@ class SerializerOpenapiRenderer {
                     ////////////////////////////
                     // end: custom attributes //
                     ////////////////////////////
-                    //////////////////////////
-                    // delegated attributes //
-                    //////////////////////////
+                    //////////////////////////////////////////
+                    // attributes and delegated attributes //
+                    //////////////////////////////////////////
+                    case 'attribute':
                     case 'delegatedAttribute': {
                         const outputAttributeName = this.setCase(attribute.options?.as ?? attribute.name);
                         const openapi = attribute.options.openapi;
                         newlyReferencedSerializers = (0, allSerializersFromHandWrittenOpenapi_js_1.default)(openapi);
-                        accumulator[outputAttributeName] = (0, allSerializersToRefsInOpenapi_js_1.default)((0, openapiShorthandToOpenapi_js_1.default)(openapi));
+                        let target;
+                        if (attributeType === 'delegatedAttribute' && DataTypeForOpenapi?.isDream) {
+                            const source = DataTypeForOpenapi;
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+                            const associatedModelOrModels = source['getAssociationMetadata'](attribute.targetName)?.modelCB();
+                            target = Array.isArray(associatedModelOrModels)
+                                ? associatedModelOrModels[0]
+                                : associatedModelOrModels;
+                        }
+                        else if (attributeType === 'delegatedAttribute') {
+                            target = undefined;
+                        }
+                        else {
+                            target = DataTypeForOpenapi;
+                        }
+                        accumulator[outputAttributeName] = (0, allSerializersToRefsInOpenapi_js_1.default)(target?.isDream
+                            ? (0, dreamAttributeOpenapiShape_js_1.dreamColumnOpenapiShape)(target, attribute.name, openapi, {
+                                suppressResponseEnums: this.suppressResponseEnums,
+                            })
+                            : (0, openapiShorthandToOpenapi_js_1.default)(openapi));
                         return accumulator;
                     }
-                    ///////////////////////////////
-                    // end: delegated attributes //
-                    ///////////////////////////////
+                    /////////////////////////////////////////////
+                    // end:attributes and delegated attributes //
+                    /////////////////////////////////////////////
                     //////////////////
                     // rendersOnes  //
                     //////////////////

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

@@ -474,6 +474,8 @@ class OpenapiEndpointRenderer {
             return true;
         if (body.including)
             return true;
+        if (body.combining)
+            return true;
         if (body.for)
             return true;
         if (body.required && body.type !== 'object')
@@ -494,12 +496,16 @@ class OpenapiEndpointRenderer {
         const dreamClass = forDreamClass || this.getSingleDreamModelClass();
         if (!dreamClass)
             return this.defaultRequestBody();
-        const { only, including } = (this.requestBody || {});
+        const { only, including, combining } = (this.requestBody || {});
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const paramSafeColumns = (0, paramNamesForDreamClass_js_1.default)(dreamClass, { only, including });
         const paramsShape = {
             type: 'object',
-            properties: {},
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            properties: {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                ...(combining || {}),
+            },
         };
         const required = this.requestBody?.required;
         if (required) {