@rvoh/psychic-spec-helpers 1.1.5 → 1.1.6

package/dist/esm/spec/features/setup/hooks.js

@@ -1,10 +1,10 @@
-import { DreamApp } from '@rvoh/dream';
+import { Dream, DreamApp } from '@rvoh/dream';
 import { provideDreamViteMatchers, truncate } from '@rvoh/dream-spec-helpers';
 import { PsychicServer } from '@rvoh/psychic';
 import { providePuppeteerViteMatchers } from '../../../src/index.js';
 import initializePsychicApp from '../../../test-app/src/cli/helpers/initializePsychicApp.js';
 import getPage from '../helpers/getPage.js';
-provideDreamViteMatchers();
+provideDreamViteMatchers(Dream);
 providePuppeteerViteMatchers();
 global.context = describe;
 global.jest = vi;

package/dist/esm/spec/unit/OpenapiSpecRequest/post.spec.js

@@ -54,4 +54,15 @@ describe('OpenapiSpecRequest#post', () => {
             });
         });
     });
+    context('with nested resources', () => {
+        it('correctly absorbs uri params from provided options', async () => {
+            const userId = '123';
+            await request.post('/users/{userId}/posts', 201, {
+                userId,
+                headers: {
+                    hello: 'world',
+                },
+            });
+        });
+    });
 });

package/dist/esm/spec/unit/OpenapiSpecSession/delete.spec.js

@@ -1,5 +1,6 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { OpenapiSpecRequest } from '../../../src/unit/OpenapiSpecRequest.js';
+import Balloon from '../../../test-app/src/app/models/Balloon.js';
 import User from '../../../test-app/src/app/models/User.js';
 const request = new OpenapiSpecRequest();
 describe('OpenapiSpecSession#delete', () => {
@@ -14,4 +15,16 @@ describe('OpenapiSpecSession#delete', () => {
         });
         expect(await User.count()).toEqual(0);
     });
+    context('nested resource', () => {
+        it('correctly interprets the nested resource id', async () => {
+            const user = await User.create({ email: 'abc@def' });
+            const balloon = await Balloon.create({ user, color: 'red' });
+            const session = await request.session('get', '/users', 200);
+            await session.delete('/users/{userId}/balloons/{id}', 204, {
+                userId: user.id,
+                id: balloon.id,
+            });
+            expect(await Balloon.count()).toEqual(0);
+        });
+    });
 });

package/dist/esm/spec/unit/OpenapiSpecSession/get.spec.js

@@ -1,5 +1,6 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { OpenapiSpecRequest } from '../../../src/unit/OpenapiSpecRequest.js';
+import Balloon from '../../../test-app/src/app/models/Balloon.js';
 import User from '../../../test-app/src/app/models/User.js';
 const request = new OpenapiSpecRequest();
 describe('OpenapiSpecSession#get', () => {
@@ -21,4 +22,17 @@ describe('OpenapiSpecSession#get', () => {
             expect(res.body).toEqual([{ id: user.id, email: 'abc@def' }]);
         });
     });
+    context('nested resource', () => {
+        it('correctly interprets the nested resource id', async () => {
+            const user = await User.create({ email: 'abc@def' });
+            const balloon = await Balloon.create({ user, color: 'red' });
+            const session = await request.session('get', '/users', 200);
+            const { body } = await session.get('/users/{userId}/balloons/{id}', 200, {
+                userId: user.id,
+                id: balloon.id,
+            });
+            expect(body.id).toEqual(balloon.id);
+            expect(body.color).toEqual('red');
+        });
+    });
 });

package/dist/esm/spec/unit/OpenapiSpecSession/patch.spec.js

@@ -1,5 +1,6 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { OpenapiSpecRequest } from '../../../src/unit/OpenapiSpecRequest.js';
+import Balloon from '../../../test-app/src/app/models/Balloon.js';
 import User from '../../../test-app/src/app/models/User.js';
 const request = new OpenapiSpecRequest();
 describe('OpenapiSpecSession#put', () => {
@@ -17,4 +18,20 @@ describe('OpenapiSpecSession#put', () => {
         });
         await User.findOrFailBy({ email: 'how@yadoin' });
     });
+    context('nested resource', () => {
+        it('correctly interprets the nested resource id', async () => {
+            const user = await User.create({ email: 'abc@def' });
+            const balloon = await Balloon.create({ user, color: 'red' });
+            const session = await request.session('get', '/users', 200);
+            await session.patch('/users/{userId}/balloons/{id}', 204, {
+                userId: user.id,
+                id: balloon.id,
+                data: {
+                    color: 'blue',
+                },
+            });
+            await balloon.reload();
+            expect(balloon.color).toEqual('blue');
+        });
+    });
 });

package/dist/esm/spec/unit/OpenapiSpecSession/post.spec.js

@@ -1,5 +1,6 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { OpenapiSpecRequest } from '../../../src/unit/OpenapiSpecRequest.js';
+import Balloon from '../../../test-app/src/app/models/Balloon.js';
 import User from '../../../test-app/src/app/models/User.js';
 const request = new OpenapiSpecRequest();
 describe('OpenapiSpecSession#post', () => {
@@ -15,4 +16,19 @@ describe('OpenapiSpecSession#post', () => {
         });
         await User.findOrFailBy({ email: 'how@yadoin' });
     });
+    context('nested resource', () => {
+        it('correctly interprets the nested resource id', async () => {
+            const user = await User.create({ email: 'abc@def' });
+            const session = await request.session('get', '/users', 200);
+            await session.post('/users/{userId}/balloons', 201, {
+                userId: user.id,
+                data: {
+                    color: 'blue',
+                },
+            });
+            const balloon = await Balloon.preload('user').first();
+            expect(balloon?.color).toEqual('blue');
+            expect(balloon?.user).toMatchDreamModel(user);
+        });
+    });
 });

package/dist/esm/spec/unit/OpenapiSpecSession/put.spec.js

@@ -1,12 +1,13 @@
 import { PsychicServer } from '@rvoh/psychic';
 import { OpenapiSpecRequest } from '../../../src/unit/OpenapiSpecRequest.js';
+import Balloon from '../../../test-app/src/app/models/Balloon.js';
 import User from '../../../test-app/src/app/models/User.js';
 const request = new OpenapiSpecRequest();
 describe('OpenapiSpecSession#put', () => {
     beforeEach(async () => {
         await request.init(PsychicServer);
     });
-    it('issues a patch request to a controller endpoint, passing when the status matches', async () => {
+    it('issues a put request to a controller endpoint, passing when the status matches', async () => {
         const user = await User.create({ email: 'abc@def' });
         const session = await request.session('get', '/users', 200);
         await session.put('/users/{id}/update-put', 204, {
@@ -17,4 +18,20 @@ describe('OpenapiSpecSession#put', () => {
         });
         await User.findOrFailBy({ email: 'how@yadoin' });
     });
+    context('nested resource', () => {
+        it('correctly interprets the nested resource id', async () => {
+            const user = await User.create({ email: 'abc@def' });
+            const balloon = await Balloon.create({ user, color: 'red' });
+            const session = await request.session('get', '/users', 200);
+            await session.put('/users/{userId}/balloons/{id}/update-put', 204, {
+                userId: user.id,
+                id: balloon.id,
+                data: {
+                    color: 'blue',
+                },
+            });
+            await balloon.reload();
+            expect(balloon.color).toEqual('blue');
+        });
+    });
 });

package/dist/esm/spec/unit/setup/hooks.js

@@ -1,7 +1,7 @@
-import { DreamApp } from '@rvoh/dream';
+import { Dream, DreamApp } from '@rvoh/dream';
 import { provideDreamViteMatchers, truncate } from '@rvoh/dream-spec-helpers';
 import initializePsychicApp from '../../../test-app/src/cli/helpers/initializePsychicApp.js';
-provideDreamViteMatchers();
+provideDreamViteMatchers(Dream);
 global.context = describe;
 global.jest = vi;
 beforeEach(async () => {

package/dist/esm/src/unit/OpenapiSpecSession.js

@@ -129,7 +129,7 @@ export class OpenapiSpecSession {
      *                       (Optional)
      */
     opts) {
-        return await this.makeRequest('post', uri, expectedStatus, opts);
+        return await this.makeRequest('post', fillOpenapiParams(uri, opts || {}), expectedStatus, opts);
     }
     async put(
     /**

package/dist/esm/test-app/src/app/controllers/Users/BalloonsController.js

@@ -0,0 +1,139 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { OpenAPI } from '@rvoh/psychic';
+import Balloon from '../../models/Balloon.js';
+import User from '../../models/User.js';
+import UsersBaseController from './BaseController.js';
+const openApiTags = ['balloons'];
+let UsersBalloonsController = (() => {
+    let _classSuper = UsersBaseController;
+    let _instanceExtraInitializers = [];
+    let _index_decorators;
+    let _show_decorators;
+    let _create_decorators;
+    let _update_decorators;
+    let _updatePut_decorators;
+    let _destroy_decorators;
+    return class UsersBalloonsController extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _index_decorators = [OpenAPI(Balloon, {
+                    status: 200,
+                    tags: openApiTags,
+                    description: 'Fetch multiple Balloons',
+                    many: true,
+                    serializerKey: 'summary',
+                })];
+            _show_decorators = [OpenAPI(Balloon, {
+                    status: 200,
+                    tags: openApiTags,
+                    description: 'Fetch a Balloon',
+                })];
+            _create_decorators = [OpenAPI(Balloon, {
+                    status: 201,
+                    tags: openApiTags,
+                    description: 'Create a Balloon',
+                })];
+            _update_decorators = [OpenAPI(Balloon, {
+                    status: 204,
+                    tags: openApiTags,
+                    description: 'Update a Balloon',
+                })];
+            _updatePut_decorators = [OpenAPI(Balloon, {
+                    status: 204,
+                    tags: openApiTags,
+                    description: 'Update a Balloon',
+                })];
+            _destroy_decorators = [OpenAPI({
+                    status: 204,
+                    tags: openApiTags,
+                    description: 'Destroy a Balloon',
+                })];
+            __esDecorate(this, null, _index_decorators, { kind: "method", name: "index", static: false, private: false, access: { has: obj => "index" in obj, get: obj => obj.index }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _show_decorators, { kind: "method", name: "show", static: false, private: false, access: { has: obj => "show" in obj, get: obj => obj.show }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _create_decorators, { kind: "method", name: "create", static: false, private: false, access: { has: obj => "create" in obj, get: obj => obj.create }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _update_decorators, { kind: "method", name: "update", static: false, private: false, access: { has: obj => "update" in obj, get: obj => obj.update }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _updatePut_decorators, { kind: "method", name: "updatePut", static: false, private: false, access: { has: obj => "updatePut" in obj, get: obj => obj.updatePut }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _destroy_decorators, { kind: "method", name: "destroy", static: false, private: false, access: { has: obj => "destroy" in obj, get: obj => obj.destroy }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        async index() {
+            const user = await this.user();
+            const balloons = await user.associationQuery('balloons').preloadFor('summary').all();
+            this.ok(balloons);
+        }
+        async show() {
+            const balloon = await this.balloon();
+            this.ok(balloon);
+        }
+        async create() {
+            const user = await this.user();
+            let balloon = await user.createAssociation('balloons', this.paramsFor(Balloon));
+            if (balloon.isPersisted)
+                balloon = await balloon.loadFor('default').execute();
+            this.created(balloon);
+        }
+        async update() {
+            const balloon = await this.balloon();
+            await balloon.update(this.paramsFor(Balloon));
+            this.noContent();
+        }
+        async updatePut() {
+            const balloon = await this.balloon();
+            await balloon.update(this.paramsFor(Balloon));
+            this.noContent();
+        }
+        async destroy() {
+            const balloon = await this.balloon();
+            await balloon.destroy();
+            this.noContent();
+        }
+        async user() {
+            return await User.findOrFail(this.castParam('userId', 'string'));
+        }
+        async balloon() {
+            const user = await this.user();
+            return await user
+                .associationQuery('balloons')
+                .preloadFor('default')
+                .findOrFail(this.castParam('id', 'string'));
+        }
+        constructor() {
+            super(...arguments);
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+    };
+})();
+export default UsersBalloonsController;

package/dist/esm/test-app/src/app/controllers/Users/BaseController.js

@@ -0,0 +1,3 @@
+import ApplicationController from '../ApplicationController.js';
+export default class UsersBaseController extends ApplicationController {
+}

package/dist/esm/test-app/src/app/models/Balloon.js

@@ -0,0 +1,67 @@
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+import { Decorators } from '@rvoh/dream';
+import ApplicationModel from './ApplicationModel.js';
+const deco = new Decorators();
+let Balloon = (() => {
+    let _classSuper = ApplicationModel;
+    let _user_decorators;
+    let _user_initializers = [];
+    let _user_extraInitializers = [];
+    return class Balloon extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _user_decorators = [deco.BelongsTo('User', { on: 'userId' })];
+            __esDecorate(null, null, _user_decorators, { kind: "field", name: "user", static: false, private: false, access: { has: obj => "user" in obj, get: obj => obj.user, set: (obj, value) => { obj.user = value; } }, metadata: _metadata }, _user_initializers, _user_extraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        get table() {
+            return 'balloons';
+        }
+        get serializers() {
+            return {
+                default: 'BalloonSerializer',
+                summary: 'BalloonSummarySerializer',
+            };
+        }
+        id;
+        color;
+        createdAt;
+        updatedAt;
+        user = __runInitializers(this, _user_initializers, void 0);
+        userId = __runInitializers(this, _user_extraInitializers);
+    };
+})();
+export default Balloon;

package/dist/esm/test-app/src/app/models/User.js

@@ -1,16 +1,70 @@
-import ApplicationModel from './ApplicationModel.js';
-export default class User extends ApplicationModel {
-    get table() {
-        return 'users';
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
     }
-    get serializers() {
-        return {
-            default: 'UserSerializer',
-            summary: 'UserSummarySerializer',
-        };
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
     }
-    id;
-    email;
-    createdAt;
-    updatedAt;
-}
+    return useValue ? value : void 0;
+};
+import { Decorators } from '@rvoh/dream';
+import ApplicationModel from './ApplicationModel.js';
+const deco = new Decorators();
+let User = (() => {
+    let _classSuper = ApplicationModel;
+    let _balloons_decorators;
+    let _balloons_initializers = [];
+    let _balloons_extraInitializers = [];
+    return class User extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _balloons_decorators = [deco.HasMany('Balloon', { on: 'userId' })];
+            __esDecorate(null, null, _balloons_decorators, { kind: "field", name: "balloons", static: false, private: false, access: { has: obj => "balloons" in obj, get: obj => obj.balloons, set: (obj, value) => { obj.balloons = value; } }, metadata: _metadata }, _balloons_initializers, _balloons_extraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        get table() {
+            return 'users';
+        }
+        get serializers() {
+            return {
+                default: 'UserSerializer',
+                summary: 'UserSummarySerializer',
+            };
+        }
+        id;
+        email;
+        createdAt;
+        updatedAt;
+        balloons = __runInitializers(this, _balloons_initializers, void 0);
+        constructor() {
+            super(...arguments);
+            __runInitializers(this, _balloons_extraInitializers);
+        }
+    };
+})();
+export default User;

package/dist/esm/test-app/src/app/serializers/BalloonSerializer.js

@@ -0,0 +1,4 @@
+import { DreamSerializer } from '@rvoh/dream';
+import Balloon from '../models/Balloon.js';
+export const BalloonSummarySerializer = (balloon) => DreamSerializer(Balloon, balloon).attribute('id');
+export const BalloonSerializer = (balloon) => BalloonSummarySerializer(balloon).attribute('color');

package/dist/esm/test-app/src/conf/app.js

@@ -9,7 +9,6 @@ export default async (psy) => {
     psy.set('packageManager', 'yarn');
     psy.set('apiOnly', false);
     psy.set('apiRoot', srcPath('..', '..'));
-    psy.set('clientRoot', srcPath('..', 'client'));
     psy.set('inflections', inflections);
     psy.set('routes', routesCb);
     psy.set('encryption', {

package/dist/esm/test-app/src/conf/routes.js

@@ -1,7 +1,8 @@
+import HeadersController from '../app/controllers/HeadersController.js';
 import SpecRequestController from '../app/controllers/SpecRequestController.js';
 import UserController from '../app/controllers/UserController.js';
+import UsersBalloonsController from '../app/controllers/Users/BalloonsController.js';
 import UsersController from '../app/controllers/UsersController.js';
-import HeadersController from '../app/controllers/HeadersController.js';
 export default (r) => {
     r.get('/spec-request/get-test', SpecRequestController, 'testGet');
     r.post('/spec-request/post-test', SpecRequestController, 'testPost');
@@ -15,6 +16,9 @@ export default (r) => {
     r.resources('users', r => {
         r.put('update-put', UsersController, 'updatePut');
         r.resources('posts');
+        r.resources('balloons', r => {
+            r.put('update-put', UsersBalloonsController, 'updatePut');
+        });
     });
     r.resource('user', r => {
         r.put('update-put', UserController, 'updatePut');

package/dist/esm/test-app/src/db/migrations/1760239324666-create-balloon.js

@@ -0,0 +1,18 @@
+import { sql } from 'kysely';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function up(db) {
+    await db.schema.createType('balloon_colors_enum').asEnum(['blue', 'green', 'red']).execute();
+    await db.schema
+        .createTable('balloons')
+        .addColumn('id', 'bigserial', col => col.primaryKey())
+        .addColumn('user_id', 'bigint', col => col.references('users.id').onDelete('restrict').notNull())
+        .addColumn('color', sql `balloon_colors_enum`, col => col.notNull())
+        .addColumn('created_at', 'timestamp', col => col.notNull())
+        .addColumn('updated_at', 'timestamp', col => col.notNull())
+        .execute();
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function down(db) {
+    await db.schema.dropTable('balloons').execute();
+    await db.schema.dropType('balloon_colors_enum').execute();
+}

package/dist/esm/test-app/src/types/db.js

@@ -1,3 +1,9 @@
+export const BalloonColorsEnumValues = [
+    "blue",
+    "green",
+    "red"
+];
 export class DBClass {
+    balloons;
     users;
 }

package/dist/esm/test-app/src/types/dream.globals.js

@@ -1,3 +1,8 @@
 export const globalTypeConfig = {
-    serializers: ['UserSerializer', 'UserSummarySerializer'],
+    serializers: [
+        'BalloonSerializer',
+        'BalloonSummarySerializer',
+        'UserSerializer',
+        'UserSummarySerializer'
+    ],
 };

package/dist/esm/test-app/src/types/dream.js

@@ -55,7 +55,75 @@ us humans, he says:
 "
 
 */
+import { BalloonColorsEnumValues } from './db.js';
 export const schema = {
+    balloons: {
+        serializerKeys: ['default', 'summary'],
+        scopes: {
+            default: [],
+            named: [],
+        },
+        nonJsonColumnNames: ['color', 'createdAt', 'id', 'updatedAt', 'userId'],
+        columns: {
+            color: {
+                coercedType: {},
+                enumType: {},
+                enumArrayType: [],
+                enumValues: BalloonColorsEnumValues,
+                dbType: 'balloon_colors_enum',
+                allowNull: false,
+                isArray: false,
+            },
+            createdAt: {
+                coercedType: {},
+                enumType: null,
+                enumArrayType: null,
+                enumValues: null,
+                dbType: 'timestamp without time zone',
+                allowNull: false,
+                isArray: false,
+            },
+            id: {
+                coercedType: {},
+                enumType: null,
+                enumArrayType: null,
+                enumValues: null,
+                dbType: 'bigint',
+                allowNull: false,
+                isArray: false,
+            },
+            updatedAt: {
+                coercedType: {},
+                enumType: null,
+                enumArrayType: null,
+                enumValues: null,
+                dbType: 'timestamp without time zone',
+                allowNull: false,
+                isArray: false,
+            },
+            userId: {
+                coercedType: {},
+                enumType: null,
+                enumArrayType: null,
+                enumValues: null,
+                dbType: 'bigint',
+                allowNull: false,
+                isArray: false,
+            },
+        },
+        virtualColumns: [],
+        associations: {
+            user: {
+                type: 'BelongsTo',
+                foreignKey: 'userId',
+                foreignKeyTypeColumn: null,
+                tables: ['users'],
+                optional: false,
+                requiredAndClauses: null,
+                passthroughAndClauses: null,
+            },
+        },
+    },
     users: {
         serializerKeys: ['default', 'summary'],
         scopes: {
@@ -102,7 +170,17 @@ export const schema = {
             },
         },
         virtualColumns: [],
-        associations: {},
+        associations: {
+            balloons: {
+                type: 'HasMany',
+                foreignKey: 'userId',
+                foreignKeyTypeColumn: null,
+                tables: ['balloons'],
+                optional: null,
+                requiredAndClauses: null,
+                passthroughAndClauses: null,
+            },
+        },
     },
 };
 export const connectionTypeConfig = {
@@ -110,6 +188,7 @@ export const connectionTypeConfig = {
     allDefaultScopeNames: [],
     globalNames: {
         models: {
+            'Balloon': 'balloons',
             'User': 'users'
         },
     },

package/dist/types/test-app/src/app/controllers/Users/BalloonsController.d.ts

@@ -0,0 +1,11 @@
+import UsersBaseController from './BaseController.js';
+export default class UsersBalloonsController extends UsersBaseController {
+    index(): Promise<void>;
+    show(): Promise<void>;
+    create(): Promise<void>;
+    update(): Promise<void>;
+    updatePut(): Promise<void>;
+    destroy(): Promise<void>;
+    private user;
+    private balloon;
+}

package/dist/types/test-app/src/app/controllers/Users/BaseController.d.ts

@@ -0,0 +1,3 @@
+import ApplicationController from '../ApplicationController.js';
+export default class UsersBaseController extends ApplicationController {
+}

package/dist/types/test-app/src/app/models/ApplicationModel.d.ts

@@ -3,6 +3,73 @@ import { DBClass } from '../../types/db.js';
 export default class ApplicationModel extends Dream {
     DB: DBClass;
     get schema(): {
+        readonly balloons: {
+            readonly serializerKeys: readonly ["default", "summary"];
+            readonly scopes: {
+                readonly default: readonly [];
+                readonly named: readonly [];
+            };
+            readonly nonJsonColumnNames: readonly ["color", "createdAt", "id", "updatedAt", "userId"];
+            readonly columns: {
+                readonly color: {
+                    readonly coercedType: import("../../types/db.js").BalloonColorsEnum;
+                    readonly enumType: import("../../types/db.js").BalloonColorsEnum;
+                    readonly enumArrayType: import("../../types/db.js").BalloonColorsEnum[];
+                    readonly enumValues: readonly ["blue", "green", "red"];
+                    readonly dbType: "balloon_colors_enum";
+                    readonly allowNull: false;
+                    readonly isArray: false;
+                };
+                readonly createdAt: {
+                    readonly coercedType: import("@rvoh/dream").DateTime;
+                    readonly enumType: null;
+                    readonly enumArrayType: null;
+                    readonly enumValues: null;
+                    readonly dbType: "timestamp without time zone";
+                    readonly allowNull: false;
+                    readonly isArray: false;
+                };
+                readonly id: {
+                    readonly coercedType: string;
+                    readonly enumType: null;
+                    readonly enumArrayType: null;
+                    readonly enumValues: null;
+                    readonly dbType: "bigint";
+                    readonly allowNull: false;
+                    readonly isArray: false;
+                };
+                readonly updatedAt: {
+                    readonly coercedType: import("@rvoh/dream").DateTime;
+                    readonly enumType: null;
+                    readonly enumArrayType: null;
+                    readonly enumValues: null;
+                    readonly dbType: "timestamp without time zone";
+                    readonly allowNull: false;
+                    readonly isArray: false;
+                };
+                readonly userId: {
+                    readonly coercedType: string;
+                    readonly enumType: null;
+                    readonly enumArrayType: null;
+                    readonly enumValues: null;
+                    readonly dbType: "bigint";
+                    readonly allowNull: false;
+                    readonly isArray: false;
+                };
+            };
+            readonly virtualColumns: readonly [];
+            readonly associations: {
+                readonly user: {
+                    readonly type: "BelongsTo";
+                    readonly foreignKey: "userId";
+                    readonly foreignKeyTypeColumn: null;
+                    readonly tables: readonly ["users"];
+                    readonly optional: false;
+                    readonly requiredAndClauses: null;
+                    readonly passthroughAndClauses: null;
+                };
+            };
+        };
         readonly users: {
             readonly serializerKeys: readonly ["default", "summary"];
             readonly scopes: {
@@ -49,7 +116,17 @@ export default class ApplicationModel extends Dream {
                 };
             };
             readonly virtualColumns: readonly [];
-            readonly associations: {};
+            readonly associations: {
+                readonly balloons: {
+                    readonly type: "HasMany";
+                    readonly foreignKey: "userId";
+                    readonly foreignKeyTypeColumn: null;
+                    readonly tables: readonly ["balloons"];
+                    readonly optional: null;
+                    readonly requiredAndClauses: null;
+                    readonly passthroughAndClauses: null;
+                };
+            };
         };
     };
     get connectionTypeConfig(): {
@@ -57,11 +134,12 @@ export default class ApplicationModel extends Dream {
         readonly allDefaultScopeNames: readonly [];
         readonly globalNames: {
             readonly models: {
+                readonly Balloon: "balloons";
                 readonly User: "users";
             };
         };
     };
     get globalTypeConfig(): {
-        readonly serializers: readonly ["UserSerializer", "UserSummarySerializer"];
+        readonly serializers: readonly ["BalloonSerializer", "BalloonSummarySerializer", "UserSerializer", "UserSummarySerializer"];
     };
 }

package/dist/types/test-app/src/app/models/Balloon.d.ts

@@ -0,0 +1,13 @@
+import { DreamColumn, DreamSerializers } from '@rvoh/dream';
+import ApplicationModel from './ApplicationModel.js';
+import User from './User.js';
+export default class Balloon extends ApplicationModel {
+    get table(): "balloons";
+    get serializers(): DreamSerializers<Balloon>;
+    id: DreamColumn<Balloon, 'id'>;
+    color: DreamColumn<Balloon, 'color'>;
+    createdAt: DreamColumn<Balloon, 'createdAt'>;
+    updatedAt: DreamColumn<Balloon, 'updatedAt'>;
+    user: User;
+    userId: DreamColumn<Balloon, 'userId'>;
+}

package/dist/types/test-app/src/app/models/User.d.ts

@@ -1,5 +1,6 @@
 import { DreamColumn, DreamSerializers } from '@rvoh/dream';
 import ApplicationModel from './ApplicationModel.js';
+import Balloon from './Balloon.js';
 export default class User extends ApplicationModel {
     get table(): "users";
     get serializers(): DreamSerializers<User>;
@@ -7,4 +8,5 @@ export default class User extends ApplicationModel {
     email: DreamColumn<User, 'email'>;
     createdAt: DreamColumn<User, 'createdAt'>;
     updatedAt: DreamColumn<User, 'updatedAt'>;
+    balloons: Balloon;
 }

package/dist/types/test-app/src/app/serializers/BalloonSerializer.d.ts

@@ -0,0 +1,3 @@
+import Balloon from '../models/Balloon.js';
+export declare const BalloonSummarySerializer: (balloon: Balloon) => import("@rvoh/dream").DreamSerializerBuilder<typeof Balloon, Balloon, undefined, Balloon>;
+export declare const BalloonSerializer: (balloon: Balloon) => import("@rvoh/dream").DreamSerializerBuilder<typeof Balloon, Balloon, undefined, Balloon>;

package/dist/types/test-app/src/db/migrations/1760239324666-create-balloon.d.ts

@@ -0,0 +1,3 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<any>): Promise<void>;
+export declare function down(db: Kysely<any>): Promise<void>;

package/dist/types/test-app/src/types/db.d.ts

@@ -4,9 +4,18 @@ import { type CalendarDate, type DateTime } from '@rvoh/dream';
  * Please do not edit it manually.
  */
 import type { ColumnType } from "kysely";
+export type BalloonColorsEnum = "blue" | "green" | "red";
+export declare const BalloonColorsEnumValues: readonly ["blue", "green", "red"];
 export type Generated<T> = T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
 export type Int8 = ColumnType<string, bigint | number | string, bigint | number | string>;
 export type Timestamp = ColumnType<DateTime | CalendarDate>;
+export interface Balloons {
+    color: BalloonColorsEnum;
+    createdAt: Timestamp;
+    id: Generated<Int8>;
+    updatedAt: Timestamp;
+    userId: Int8;
+}
 export interface Users {
     createdAt: Timestamp;
     email: string | null;
@@ -14,8 +23,10 @@ export interface Users {
     updatedAt: Timestamp;
 }
 export interface DB {
+    balloons: Balloons;
     users: Users;
 }
 export declare class DBClass {
+    balloons: Balloons;
     users: Users;
 }

package/dist/types/test-app/src/types/dream.d.ts

@@ -1,5 +1,73 @@
 import { type DateTime } from '@rvoh/dream';
+import { BalloonColorsEnum } from './db.js';
 export declare const schema: {
+    readonly balloons: {
+        readonly serializerKeys: readonly ["default", "summary"];
+        readonly scopes: {
+            readonly default: readonly [];
+            readonly named: readonly [];
+        };
+        readonly nonJsonColumnNames: readonly ["color", "createdAt", "id", "updatedAt", "userId"];
+        readonly columns: {
+            readonly color: {
+                readonly coercedType: BalloonColorsEnum;
+                readonly enumType: BalloonColorsEnum;
+                readonly enumArrayType: BalloonColorsEnum[];
+                readonly enumValues: readonly ["blue", "green", "red"];
+                readonly dbType: "balloon_colors_enum";
+                readonly allowNull: false;
+                readonly isArray: false;
+            };
+            readonly createdAt: {
+                readonly coercedType: DateTime;
+                readonly enumType: null;
+                readonly enumArrayType: null;
+                readonly enumValues: null;
+                readonly dbType: "timestamp without time zone";
+                readonly allowNull: false;
+                readonly isArray: false;
+            };
+            readonly id: {
+                readonly coercedType: string;
+                readonly enumType: null;
+                readonly enumArrayType: null;
+                readonly enumValues: null;
+                readonly dbType: "bigint";
+                readonly allowNull: false;
+                readonly isArray: false;
+            };
+            readonly updatedAt: {
+                readonly coercedType: DateTime;
+                readonly enumType: null;
+                readonly enumArrayType: null;
+                readonly enumValues: null;
+                readonly dbType: "timestamp without time zone";
+                readonly allowNull: false;
+                readonly isArray: false;
+            };
+            readonly userId: {
+                readonly coercedType: string;
+                readonly enumType: null;
+                readonly enumArrayType: null;
+                readonly enumValues: null;
+                readonly dbType: "bigint";
+                readonly allowNull: false;
+                readonly isArray: false;
+            };
+        };
+        readonly virtualColumns: readonly [];
+        readonly associations: {
+            readonly user: {
+                readonly type: "BelongsTo";
+                readonly foreignKey: "userId";
+                readonly foreignKeyTypeColumn: null;
+                readonly tables: readonly ["users"];
+                readonly optional: false;
+                readonly requiredAndClauses: null;
+                readonly passthroughAndClauses: null;
+            };
+        };
+    };
     readonly users: {
         readonly serializerKeys: readonly ["default", "summary"];
         readonly scopes: {
@@ -46,7 +114,17 @@ export declare const schema: {
             };
         };
         readonly virtualColumns: readonly [];
-        readonly associations: {};
+        readonly associations: {
+            readonly balloons: {
+                readonly type: "HasMany";
+                readonly foreignKey: "userId";
+                readonly foreignKeyTypeColumn: null;
+                readonly tables: readonly ["balloons"];
+                readonly optional: null;
+                readonly requiredAndClauses: null;
+                readonly passthroughAndClauses: null;
+            };
+        };
     };
 };
 export declare const connectionTypeConfig: {
@@ -54,6 +132,7 @@ export declare const connectionTypeConfig: {
     readonly allDefaultScopeNames: readonly [];
     readonly globalNames: {
         readonly models: {
+            readonly Balloon: "balloons";
             readonly User: "users";
         };
     };

package/dist/types/test-app/src/types/dream.globals.d.ts

@@ -1,3 +1,3 @@
 export declare const globalTypeConfig: {
-    readonly serializers: readonly ["UserSerializer", "UserSummarySerializer"];
+    readonly serializers: readonly ["BalloonSerializer", "BalloonSummarySerializer", "UserSerializer", "UserSummarySerializer"];
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@rvoh/psychic-spec-helpers",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "psychic framework spec helpers",
   "author": "RVO Health",
   "repository": {
@@ -30,6 +30,7 @@
     "uspec": "vitest --config ./spec/unit/vite.config.ts",
     "fspec": "vitest --config ./spec/features/vite.config.ts",
     "build": "echo \"building psychic-spec-helpers...\" && rm -rf dist && npx tsc -p ./tsconfig.json",
+    "build:test-app": "rm -rf dist && echo \"building test app to esm...\" && npx tsc -p ./tsconfig.esm.build.test-app.json && echo \"building test app to cjs...\" && npx tsc -p ./tsconfig.cjs.build.test-app.json",
     "lint": "yarn run eslint --no-warn-ignored \"src/**/*.ts\" \"spec/**/*.ts\" && yarn run prettier . --check",
     "format": "yarn run prettier . --write",
     "prepack": "yarn build"
@@ -46,9 +47,9 @@
   },
   "devDependencies": {
     "@eslint/js": "=9.0.0",
-    "@rvoh/dream": "^1.5.0",
-    "@rvoh/dream-spec-helpers": "^1.1.1",
-    "@rvoh/psychic": "^1.5.2",
+    "@rvoh/dream": "^1.11.1",
+    "@rvoh/dream-spec-helpers": "^1.2.1",
+    "@rvoh/psychic": "^1.12.2",
     "@types/cookiejar": "^2",
     "@types/express": "^4",
     "@types/node": "^22.5.1",
@@ -56,8 +57,8 @@
     "@types/supertest": "^6.0.3",
     "eslint": "^9.9.1",
     "express": "^4.21.2",
-    "kysely": "^0.27.5",
-    "kysely-codegen": "^0.17.0",
+    "kysely": "^0.28.5",
+    "kysely-codegen": "~0.17.0",
     "luxon-jest-matchers": "^0.1.14",
     "openapi-typescript": "^7.8.0",
     "pg": "^8.13.1",
@@ -73,4 +74,4 @@
   "dependencies": {
     "cookiejar": "^2.1.4"
   }
-}
+}

package/src/unit/OpenapiSpecSession.ts

@@ -178,7 +178,12 @@ export class OpenapiSpecSession<OpenapiPaths> {
       ? OpenapiSpecRequestOptsPost<RequestBodyJsonContent>
       : OpenapiSpecRequestOptsPost<RequestBodyJsonContent> & { [K in Params[number]]: string }
   ): Promise<OpenapiSpecResponse<JsonContent>> {
-    return await this.makeRequest('post', uri, expectedStatus, opts as SpecRequestOptsAll)
+    return await this.makeRequest(
+      'post',
+      fillOpenapiParams(uri, opts || {}),
+      expectedStatus,
+      opts as SpecRequestOptsAll
+    )
   }
 
   public async put<

package/CHANGELOG.md

@@ -1,15 +0,0 @@
-## 1.1.5
-
-Add "Openapi" prefix to all newly-exported type helpers, so that comparitive helpers can be defined within a user's application to take over the more succinct namespaces
-
-## 1.1.4
-
-export RequestBody and RequestQuery, ResponseBody and ResponseCodeForUri types, so that they can be used within psychic application unit tests to be used as type guards
-
-## 1.1.1
-
-- bump supertest to close [dependabot issue](https://github.com/rvohealth/psychic-spec-helpers/security/dependabot/20)
-
-## 1.1.0
-
-- update for Dream 1.4.0

package/client/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.node.json" }
-  ]
-}