@rvoh/psychic 1.1.10 → 1.2.0

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

@@ -15,7 +15,10 @@ async function enumsFileStr() {
         const values = enums[enumName] || [];
         enumsFileStr += `\
 export const ${exportedTypeName} = [
-  ${values.map(val => `'${val}'`).join(',\n  ')}
+  ${values
+            .sort()
+            .map(val => `'${val}'`)
+            .join(',\n  ')}
 ] as const
 
 `;

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

@@ -248,7 +248,9 @@ class PsychicController {
         return this._castParam(keys, nestedParams, expectedType, opts);
     }
     paramsFor(dreamClass, opts) {
-        return params_js_1.default.for(opts?.key ? this.params[opts.key] || {} : this.params, dreamClass, opts);
+        return params_js_1.default.for(opts?.key ? this.params[opts.key] || {} : this.params, dreamClass, 
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        opts);
     }
     getCookie(name) {
         return (this.session.getCookie(name) ?? null);
@@ -258,7 +260,7 @@ class PsychicController {
     }
     startSession(user) {
         return this.setCookie(this.config.sessionCookieName, JSON.stringify({
-            id: user.primaryKeyValue,
+            id: user.primaryKeyValue().toString(),
             modelKey: user.constructor.globalName,
         }));
     }

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

@@ -245,11 +245,12 @@ suggested fix:  "${(0, helpers_js_1.convertRouteParams)(path)}"
             else if (err instanceof dream_1.RecordNotFound) {
                 res.sendStatus(404);
             }
-            else if (err instanceof dream_1.DataTypeColumnTypeMismatch ||
-                err instanceof dream_1.NotNullViolation ||
-                err instanceof dream_1.CheckConstraintViolation) {
+            else if (err instanceof dream_1.NotNullViolation || err instanceof dream_1.CheckConstraintViolation) {
                 res.status(422).json();
             }
+            else if (err instanceof dream_1.DataTypeColumnTypeMismatch) {
+                res.status(400).json();
+            }
             else if (err instanceof dream_1.ValidationError) {
                 res.status(422).json({ errors: err.errors || {} });
             }

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

@@ -44,6 +44,7 @@ class Params {
         const columns = schema[dreamClass.prototype.table]?.columns;
         const returnObj = {};
         const errors = {};
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const paramSafeColumns = (0, paramNamesForDreamClass_js_1.default)(dreamClass, forOpts);
         for (const columnName of paramSafeColumns) {
             if (params[columnName] === undefined)

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

@@ -9,7 +9,10 @@ export default async function enumsFileStr() {
         const values = enums[enumName] || [];
         enumsFileStr += `\
 export const ${exportedTypeName} = [
-  ${values.map(val => `'${val}'`).join(',\n  ')}
+  ${values
+            .sort()
+            .map(val => `'${val}'`)
+            .join(',\n  ')}
 ] as const
 
 `;

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

@@ -242,7 +242,9 @@ export default class PsychicController {
         return this._castParam(keys, nestedParams, expectedType, opts);
     }
     paramsFor(dreamClass, opts) {
-        return Params.for(opts?.key ? this.params[opts.key] || {} : this.params, dreamClass, opts);
+        return Params.for(opts?.key ? this.params[opts.key] || {} : this.params, dreamClass, 
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        opts);
     }
     getCookie(name) {
         return (this.session.getCookie(name) ?? null);
@@ -252,7 +254,7 @@ export default class PsychicController {
     }
     startSession(user) {
         return this.setCookie(this.config.sessionCookieName, JSON.stringify({
-            id: user.primaryKeyValue,
+            id: user.primaryKeyValue().toString(),
             modelKey: user.constructor.globalName,
         }));
     }

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

@@ -239,11 +239,12 @@ suggested fix:  "${convertRouteParams(path)}"
             else if (err instanceof RecordNotFound) {
                 res.sendStatus(404);
             }
-            else if (err instanceof DataTypeColumnTypeMismatch ||
-                err instanceof NotNullViolation ||
-                err instanceof CheckConstraintViolation) {
+            else if (err instanceof NotNullViolation || err instanceof CheckConstraintViolation) {
                 res.status(422).json();
             }
+            else if (err instanceof DataTypeColumnTypeMismatch) {
+                res.status(400).json();
+            }
             else if (err instanceof ValidationError) {
                 res.status(422).json({ errors: err.errors || {} });
             }

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

@@ -39,6 +39,7 @@ export default class Params {
         const columns = schema[dreamClass.prototype.table]?.columns;
         const returnObj = {};
         const errors = {};
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const paramSafeColumns = paramNamesForDreamClass(dreamClass, forOpts);
         for (const columnName of paramSafeColumns) {
             if (params[columnName] === undefined)

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "1.1.10",
+  "version": "1.2.0",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -59,8 +59,8 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^1.3.1",
-    "@rvoh/dream-spec-helpers": "^1.0.0",
+    "@rvoh/dream": "^1.4.0",
+    "@rvoh/dream-spec-helpers": "^1.1.0",
     "@rvoh/psychic-spec-helpers": "^1.0.0",
     "@types/express": "^5.0.1",
     "@types/express-session": "^1",