@rvoh/psychic 0.37.0-beta.7 → 0.37.0-beta.8

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

@@ -268,7 +268,6 @@ class PsychicController {
     singleObjectJson(data, opts) {
         if (!data)
             return data;
-        const dreamApp = dream_1.DreamApp.getOrFail();
         const psychicControllerClass = this.constructor;
         // if we already have a serializer, let's just render it
         if (data instanceof dream_1.DreamSerializerBuilder || data instanceof dream_1.ObjectSerializerBuilder) {
@@ -292,30 +291,20 @@ class PsychicController {
             }
         }
         else {
-            const serializerKey = 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-            data.serializers?.[opts.serializerKey ||
+            const serializer = (0, dream_1.inferSerializerFromDreamOrViewModel)(data, opts.serializerKey ||
                 psychicControllerClass['controllerActionMetadata'][this.action]?.['serializerKey'] ||
-                'default'];
-            if (serializerKey && Object.prototype.hasOwnProperty.call(dreamApp.serializers, serializerKey)) {
-                const serializer = dreamApp.serializers[serializerKey];
-                if (serializer && (0, dream_1.isDreamSerializer)(serializer)) {
-                    // passthrough data going into the serializer is the argument that gets
-                    // used in the custom attribute callback function
-                    return serializer(data, this.defaultSerializerPassthrough).render(
-                    // passthrough data must be passed both into the serializer and render
-                    // because, if the serializer does accept passthrough data, then passing it in is how
-                    // it gets into the serializer, but if it does not accept passthrough data, and therefore
-                    // does not pass it into the call to DreamSerializer/ObjectSerializer,
-                    // then it would be lost to serializers rendered via rendersOne/Many, and SerializerRenderer
-                    // handles passing its passthrough data into those
-                    this.defaultSerializerPassthrough, this.renderOpts);
-                }
-                else {
-                    throw new Error(`
-A serializer key was detected, but the server was unable to identify an associated serializer class matching the key.
-The key in question is: "${serializerKey}"`);
-                }
+                'default');
+            if (serializer && (0, dream_1.isDreamSerializer)(serializer)) {
+                // passthrough data going into the serializer is the argument that gets
+                // used in the custom attribute callback function
+                return serializer(data, this.defaultSerializerPassthrough).render(
+                // passthrough data must be passed both into the serializer and render
+                // because, if the serializer does accept passthrough data, then passing it in is how
+                // it gets into the serializer, but if it does not accept passthrough data, and therefore
+                // does not pass it into the call to DreamSerializer/ObjectSerializer,
+                // then it would be lost to serializers rendered via rendersOne/Many, and SerializerRenderer
+                // handles passing its passthrough data into those
+                this.defaultSerializerPassthrough, this.renderOpts);
             }
         }
         return data;
@@ -603,9 +592,6 @@ class ControllerSerializerIndex {
     lookupModel(ControllerClass, ModelClass) {
         return this.associations.find(association => association[0] === ControllerClass && association[2] === ModelClass);
     }
-    lookupSerializer(ControllerClass, SerializerClass) {
-        return this.associations.find(association => association[0] === ControllerClass && association[1] === SerializerClass);
-    }
 }
 exports.ControllerSerializerIndex = ControllerSerializerIndex;
 exports.controllerSerializerIndex = new ControllerSerializerIndex();

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

@@ -1,4 +1,4 @@
-import { DreamApp, DreamSerializerBuilder, GlobalNameNotSet, isDreamSerializer, ObjectSerializerBuilder, } from '@rvoh/dream';
+import { DreamSerializerBuilder, GlobalNameNotSet, inferSerializerFromDreamOrViewModel, isDreamSerializer, ObjectSerializerBuilder, } from '@rvoh/dream';
 import ParamValidationError from '../error/controller/ParamValidationError.js';
 import HttpStatusBadGateway from '../error/http/BadGateway.js';
 import HttpStatusBadRequest from '../error/http/BadRequest.js';
@@ -262,7 +262,6 @@ export default class PsychicController {
     singleObjectJson(data, opts) {
         if (!data)
             return data;
-        const dreamApp = DreamApp.getOrFail();
         const psychicControllerClass = this.constructor;
         // if we already have a serializer, let's just render it
         if (data instanceof DreamSerializerBuilder || data instanceof ObjectSerializerBuilder) {
@@ -286,30 +285,20 @@ export default class PsychicController {
             }
         }
         else {
-            const serializerKey = 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-            data.serializers?.[opts.serializerKey ||
+            const serializer = inferSerializerFromDreamOrViewModel(data, opts.serializerKey ||
                 psychicControllerClass['controllerActionMetadata'][this.action]?.['serializerKey'] ||
-                'default'];
-            if (serializerKey && Object.prototype.hasOwnProperty.call(dreamApp.serializers, serializerKey)) {
-                const serializer = dreamApp.serializers[serializerKey];
-                if (serializer && isDreamSerializer(serializer)) {
-                    // passthrough data going into the serializer is the argument that gets
-                    // used in the custom attribute callback function
-                    return serializer(data, this.defaultSerializerPassthrough).render(
-                    // passthrough data must be passed both into the serializer and render
-                    // because, if the serializer does accept passthrough data, then passing it in is how
-                    // it gets into the serializer, but if it does not accept passthrough data, and therefore
-                    // does not pass it into the call to DreamSerializer/ObjectSerializer,
-                    // then it would be lost to serializers rendered via rendersOne/Many, and SerializerRenderer
-                    // handles passing its passthrough data into those
-                    this.defaultSerializerPassthrough, this.renderOpts);
-                }
-                else {
-                    throw new Error(`
-A serializer key was detected, but the server was unable to identify an associated serializer class matching the key.
-The key in question is: "${serializerKey}"`);
-                }
+                'default');
+            if (serializer && isDreamSerializer(serializer)) {
+                // passthrough data going into the serializer is the argument that gets
+                // used in the custom attribute callback function
+                return serializer(data, this.defaultSerializerPassthrough).render(
+                // passthrough data must be passed both into the serializer and render
+                // because, if the serializer does accept passthrough data, then passing it in is how
+                // it gets into the serializer, but if it does not accept passthrough data, and therefore
+                // does not pass it into the call to DreamSerializer/ObjectSerializer,
+                // then it would be lost to serializers rendered via rendersOne/Many, and SerializerRenderer
+                // handles passing its passthrough data into those
+                this.defaultSerializerPassthrough, this.renderOpts);
             }
         }
         return data;
@@ -596,8 +585,5 @@ export class ControllerSerializerIndex {
     lookupModel(ControllerClass, ModelClass) {
         return this.associations.find(association => association[0] === ControllerClass && association[2] === ModelClass);
     }
-    lookupSerializer(ControllerClass, SerializerClass) {
-        return this.associations.find(association => association[0] === ControllerClass && association[1] === SerializerClass);
-    }
 }
 export const controllerSerializerIndex = new ControllerSerializerIndex();

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

@@ -200,7 +200,6 @@ export declare class ControllerSerializerIndex {
     ][];
     add(ControllerClass: typeof PsychicController, SerializerClass: DreamModelSerializerType | SimpleObjectSerializerType, ModelClass: typeof Dream): void;
     lookupModel(ControllerClass: typeof PsychicController, ModelClass: typeof Dream): [typeof PsychicController, DreamModelSerializerType | SimpleObjectSerializerType, typeof Dream] | undefined;
-    lookupSerializer(ControllerClass: typeof PsychicController, SerializerClass: DreamModelSerializerType | SimpleObjectSerializerType): [typeof PsychicController, DreamModelSerializerType | SimpleObjectSerializerType, typeof Dream] | undefined;
 }
 export declare const controllerSerializerIndex: ControllerSerializerIndex;
 export type RenderOptions = {

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.37.0-beta.7",
+  "version": "0.37.0-beta.8",
   "author": "RVOHealth",
   "repository": {
     "type": "git",