@rvoh/psychic-spec-helpers 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 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

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

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

@@ -28,4 +28,30 @@ describe('OpenapiSpecRequest#post', () => {
             });
         });
     });
+    context('with requestBody', () => {
+        context('type tests', () => {
+            it.skip('allows strings for id types', async () => {
+                await request.post('/users', 201, {
+                    data: {
+                        id: '123',
+                    },
+                });
+            });
+            it.skip('allows numbers for id types', async () => {
+                await request.post('/users', 201, {
+                    data: {
+                        id: 123,
+                    },
+                });
+            });
+            it.skip('allows primary key values for id types', async () => {
+                const user = User.new();
+                await request.post('/users', 201, {
+                    data: {
+                        id: user.id,
+                    },
+                });
+            });
+        });
+    });
 });

package/dist/esm/test-app/src/app/controllers/UsersController.js

@@ -50,6 +50,7 @@ let UsersController = (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _create_decorators = [OpenAPI(User, {
                     status: 201,
+                    requestBody: { for: User, including: ['id'] },
                 })];
             _index_decorators = [OpenAPI(User, {
                     many: true,

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

@@ -1,10 +1,14 @@
 import { Dream } from '@rvoh/dream';
-import { globalSchema, schema } from '../../types/dream.js';
+import { connectionTypeConfig, schema } from '../../types/dream.js';
+import { globalTypeConfig } from '../../types/dream.globals.js';
 export default class ApplicationModel extends Dream {
     get schema() {
         return schema;
     }
-    get globalSchema() {
-        return globalSchema;
+    get connectionTypeConfig() {
+        return connectionTypeConfig;
+    }
+    get globalTypeConfig() {
+        return globalTypeConfig;
     }
 }

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

@@ -1,5 +1,4 @@
 import { DreamSerializer } from '@rvoh/dream';
 import User from '../models/User.js';
 export const UserSummarySerializer = (user) => DreamSerializer(User, user).attribute('id');
-const UserSerializer = (user) => UserSummarySerializer(user).attribute('email');
-export default UserSerializer;
+export const UserSerializer = (user) => UserSummarySerializer(user).attribute('email');

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

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

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

@@ -105,13 +105,12 @@ export const schema = {
         associations: {},
     },
 };
-export const globalSchema = {
+export const connectionTypeConfig = {
     passthroughColumns: [],
     allDefaultScopeNames: [],
     globalNames: {
         models: {
             'User': 'users'
         },
-        serializers: ['UserSerializer', 'UserSummarySerializer'],
     },
 };

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

@@ -2,6 +2,7 @@ import { ExpectToEvaluateOpts } from './feature/internal/evaluateWithRetryAndTim
 import { CustomMatcherResult } from './feature/helpers/providePuppeteerViteMatchers.js';
 import { Page, WaitForSelectorOptions } from 'puppeteer';
 import { ToFillMatcherOpts } from './feature/matchers/toFill.js';
+export { DreamRequestAttributes as SendableAttributes } from './unit/helpers/typeHelpers.js';
 export { default as specRequest } from './unit/SpecRequest.js';
 export { default as createPsychicServer } from './unit/createPsychicServer.js';
 export { OpenapiSpecRequest } from './unit/OpenapiSpecRequest.js';

package/dist/types/src/unit/helpers/typeHelpers.d.ts

@@ -1 +1,5 @@
+import { CalendarDate, DateTime, Dream, DreamAttributes } from '@rvoh/dream';
 export type StringToInt<T extends string> = T extends `${infer N extends number}` ? N : never;
+export type DreamRequestAttributes<I extends Dream, Attrs extends DreamAttributes<I> = DreamAttributes<I>> = Partial<{
+    [K in keyof Attrs]: Attrs[K] extends undefined | null ? Attrs[K] : Attrs[K] extends DateTime | CalendarDate | null ? string : Attrs[K] extends DateTime | CalendarDate ? string : Attrs[K] extends CalendarDate | null ? string : Attrs[K] extends CalendarDate ? string : Attrs[K];
+}>;

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

@@ -52,14 +52,16 @@ export default class ApplicationModel extends Dream {
             readonly associations: {};
         };
     };
-    get globalSchema(): {
+    get connectionTypeConfig(): {
         readonly passthroughColumns: readonly [];
         readonly allDefaultScopeNames: readonly [];
         readonly globalNames: {
             readonly models: {
                 readonly User: "users";
             };
-            readonly serializers: readonly ["UserSerializer", "UserSummarySerializer"];
         };
     };
+    get globalTypeConfig(): {
+        readonly serializers: readonly ["UserSerializer", "UserSummarySerializer"];
+    };
 }

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

@@ -1,4 +1,3 @@
 import User from '../models/User.js';
 export declare const UserSummarySerializer: (user: User) => import("@rvoh/dream").DreamSerializerBuilder<typeof User, User, undefined, User>;
-declare const UserSerializer: (user: User) => import("@rvoh/dream").DreamSerializerBuilder<typeof User, User, undefined, User>;
-export default UserSerializer;
+export declare const UserSerializer: (user: User) => import("@rvoh/dream").DreamSerializerBuilder<typeof User, User, undefined, User>;

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

@@ -49,13 +49,12 @@ export declare const schema: {
         readonly associations: {};
     };
 };
-export declare const globalSchema: {
+export declare const connectionTypeConfig: {
     readonly passthroughColumns: readonly [];
     readonly allDefaultScopeNames: readonly [];
     readonly globalNames: {
         readonly models: {
             readonly User: "users";
         };
-        readonly serializers: readonly ["UserSerializer", "UserSummarySerializer"];
     };
 };

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@rvoh/psychic-spec-helpers",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "psychic framework spec helpers",
   "author": "RVO Health",
   "repository": {
@@ -36,6 +36,8 @@
   },
   "packageManager": "yarn@4.4.1",
   "peerDependencies": {
+    "@rvoh/dream": "*",
+    "@rvoh/psychic": "*",
     "@types/node": "*",
     "@types/supertest": "*",
     "puppeteer": "*",
@@ -44,9 +46,9 @@
   },
   "devDependencies": {
     "@eslint/js": "=9.0.0",
-    "@rvoh/dream": "^1.4.1",
-    "@rvoh/dream-spec-helpers": "^1.1.0",
-    "@rvoh/psychic": "^1.2.0",
+    "@rvoh/dream": "^1.5.0",
+    "@rvoh/dream-spec-helpers": "^1.1.1",
+    "@rvoh/psychic": "^1.5.2",
     "@types/cookiejar": "^2",
     "@types/express": "^4",
     "@types/node": "^22.5.1",
@@ -57,6 +59,7 @@
     "kysely": "^0.27.5",
     "kysely-codegen": "^0.17.0",
     "luxon-jest-matchers": "^0.1.14",
+    "openapi-typescript": "^7.8.0",
     "pg": "^8.13.1",
     "prettier": "^3.5.3",
     "puppeteer": "^24.4.0",
@@ -70,4 +73,4 @@
   "dependencies": {
     "cookiejar": "^2.1.4"
   }
-}
+}

package/src/index.ts

@@ -3,6 +3,9 @@ import { CustomMatcherResult } from './feature/helpers/providePuppeteerViteMatch
 import { Page, WaitForSelectorOptions } from 'puppeteer'
 import { ToFillMatcherOpts } from './feature/matchers/toFill.js'
 
+// type helpers
+export { DreamRequestAttributes as SendableAttributes } from './unit/helpers/typeHelpers.js'
+
 // unit spec helpers
 export { default as specRequest } from './unit/SpecRequest.js'
 export { default as createPsychicServer } from './unit/createPsychicServer.js'

package/src/unit/helpers/typeHelpers.ts

@@ -1 +1,20 @@
+import { CalendarDate, DateTime, Dream, DreamAttributes } from '@rvoh/dream'
+
 export type StringToInt<T extends string> = T extends `${infer N extends number}` ? N : never
+
+export type DreamRequestAttributes<
+  I extends Dream,
+  Attrs extends DreamAttributes<I> = DreamAttributes<I>,
+> = Partial<{
+  [K in keyof Attrs]: Attrs[K] extends undefined | null
+    ? Attrs[K]
+    : Attrs[K] extends DateTime | CalendarDate | null
+      ? string
+      : Attrs[K] extends DateTime | CalendarDate
+        ? string
+        : Attrs[K] extends CalendarDate | null
+          ? string
+          : Attrs[K] extends CalendarDate
+            ? string
+            : Attrs[K]
+}>