@rvoh/psychic 3.8.5 → 3.8.6

package/dist/cjs/src/openapi-renderer/body-segment.js

@@ -8,6 +8,7 @@ import isBlankDescription from './helpers/isBlankDescription.js';
 import maybeNullOpenapiShorthandToOpenapiShorthand from './helpers/maybeNullOpenapiShorthandToOpenapiShorthand.js';
 import primitiveOpenapiStatementToOpenapi from './helpers/primitiveOpenapiStatementToOpenapi.js';
 import schemaToRef from './helpers/schemaToRef.js';
+import serializersAndRefsFromSerializableRef from './helpers/serializersAndRefsFromSerializableRef.js';
 import SerializerOpenapiRenderer from './SerializerOpenapiRenderer.js';
 /**
  * @internal
@@ -494,13 +495,35 @@ The following values will be allowed:
     serializableStatement(bodySegment) {
         const serializableRef = bodySegment;
         const key = serializableRef.$serializableSerializerKey || serializableRef.key || 'default';
-        const serializer = DreamApp.system.inferSerializerFromDreamOrViewModel(serializableRef.$serializable.prototype, key);
-        if (!serializer)
-            throw new Error(`Failed to locate serializers getter from: ${serializableRef.$serializable.name} using key: ${key}`);
-        return this.serializerStatement({
-            $serializer: serializer,
-            ...serializableRef,
+        const { serializers, refs } = serializersAndRefsFromSerializableRef(serializableRef, {
+            casing: this.casing,
+            suppressResponseEnums: this.suppressResponseEnums,
         });
+        if (serializers.length === 0)
+            throw new Error(`Failed to locate serializers getter from: ${serializableRef.$serializable.name} using key: ${key}`);
+        if (serializers.length === 1) {
+            return this.serializerStatement({
+                $serializer: serializers[0],
+                ...serializableRef,
+            });
+        }
+        const serializerAnyOf = { anyOf: refs };
+        if (serializableRef.many) {
+            return {
+                referencedSerializers: serializers,
+                openapi: {
+                    type: serializableRef.maybeNull ? ['array', 'null'] : 'array',
+                    items: serializerAnyOf,
+                },
+            };
+        }
+        if (serializableRef.maybeNull) {
+            return {
+                referencedSerializers: serializers,
+                openapi: { anyOf: [...refs, { type: 'null' }] },
+            };
+        }
+        return { referencedSerializers: serializers, openapi: serializerAnyOf };
     }
     /**
      * @internal

package/dist/cjs/src/openapi-renderer/helpers/allSerializersFromHandWrittenOpenapi.js

@@ -1,5 +1,5 @@
-import { DreamApp } from '@rvoh/dream';
 import isObject from '../../helpers/isObject.js';
+import serializersAndRefsFromSerializableRef from './serializersAndRefsFromSerializableRef.js';
 /**
  * @internal
  *
@@ -54,8 +54,7 @@ value, serializers) {
         //
     }
     else if (value.$serializable) {
-        const foundSerializers = DreamApp.system.inferSerializersFromDreamClassOrViewModelClass(value.$serializable, value.$serializableSerializerKey);
-        foundSerializers.forEach(serializer => serializers.add(serializer));
+        serializersAndRefsFromSerializableRef(value).serializers.forEach(serializer => serializers.add(serializer));
         //
     }
     else if (isObject(value)) {

package/dist/cjs/src/openapi-renderer/helpers/allSerializersToRefsInOpenapi.js

@@ -1,10 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { DreamApp } from '@rvoh/dream';
 import isObject from '../../helpers/isObject.js';
 import SerializerOpenapiRenderer from '../SerializerOpenapiRenderer.js';
+import serializersAndRefsFromSerializableRef from './serializersAndRefsFromSerializableRef.js';
 /**
  * @internal
  *
@@ -69,9 +65,8 @@ function transformValue(value) {
         //
     }
     else if (value.$serializable) {
-        const { $serializable, $serializableSerializerKey, ...rest } = value;
-        const foundSerializers = DreamApp.system.inferSerializersFromDreamClassOrViewModelClass($serializable, $serializableSerializerKey);
-        const refs = foundSerializers.map(serializer => new SerializerOpenapiRenderer(serializer).serializerRef);
+        const { $serializable, $serializableSerializerKey, key, ...rest } = value;
+        const { refs } = serializersAndRefsFromSerializableRef({ $serializable, $serializableSerializerKey, key });
         if (refs.length === 0)
             return rest;
         if (refs.length === 1) {

package/dist/cjs/src/openapi-renderer/helpers/serializersAndRefsFromSerializableRef.js

@@ -0,0 +1,17 @@
+import { DreamApp } from '@rvoh/dream';
+import { sortBy, uniq } from '@rvoh/dream/utils';
+import SerializerOpenapiRenderer from '../SerializerOpenapiRenderer.js';
+export default function serializersAndRefsFromSerializableRef(serializableRef, { casing = 'camel', suppressResponseEnums = false, } = {}) {
+    const key = serializableRef.$serializableSerializerKey || serializableRef.key || 'default';
+    const serializerRefs = sortBy(uniq(DreamApp.system.inferSerializersFromDreamClassOrViewModelClass(serializableRef.$serializable, key)).map(serializer => ({
+        serializer,
+        ref: new SerializerOpenapiRenderer(serializer, {
+            casing,
+            suppressResponseEnums,
+        }).serializerRef,
+    })), ({ ref }) => ref.$ref);
+    return {
+        serializers: serializerRefs.map(({ serializer }) => serializer),
+        refs: serializerRefs.map(({ ref }) => ref),
+    };
+}

package/dist/esm/src/openapi-renderer/body-segment.js

@@ -8,6 +8,7 @@ import isBlankDescription from './helpers/isBlankDescription.js';
 import maybeNullOpenapiShorthandToOpenapiShorthand from './helpers/maybeNullOpenapiShorthandToOpenapiShorthand.js';
 import primitiveOpenapiStatementToOpenapi from './helpers/primitiveOpenapiStatementToOpenapi.js';
 import schemaToRef from './helpers/schemaToRef.js';
+import serializersAndRefsFromSerializableRef from './helpers/serializersAndRefsFromSerializableRef.js';
 import SerializerOpenapiRenderer from './SerializerOpenapiRenderer.js';
 /**
  * @internal
@@ -494,13 +495,35 @@ The following values will be allowed:
     serializableStatement(bodySegment) {
         const serializableRef = bodySegment;
         const key = serializableRef.$serializableSerializerKey || serializableRef.key || 'default';
-        const serializer = DreamApp.system.inferSerializerFromDreamOrViewModel(serializableRef.$serializable.prototype, key);
-        if (!serializer)
-            throw new Error(`Failed to locate serializers getter from: ${serializableRef.$serializable.name} using key: ${key}`);
-        return this.serializerStatement({
-            $serializer: serializer,
-            ...serializableRef,
+        const { serializers, refs } = serializersAndRefsFromSerializableRef(serializableRef, {
+            casing: this.casing,
+            suppressResponseEnums: this.suppressResponseEnums,
         });
+        if (serializers.length === 0)
+            throw new Error(`Failed to locate serializers getter from: ${serializableRef.$serializable.name} using key: ${key}`);
+        if (serializers.length === 1) {
+            return this.serializerStatement({
+                $serializer: serializers[0],
+                ...serializableRef,
+            });
+        }
+        const serializerAnyOf = { anyOf: refs };
+        if (serializableRef.many) {
+            return {
+                referencedSerializers: serializers,
+                openapi: {
+                    type: serializableRef.maybeNull ? ['array', 'null'] : 'array',
+                    items: serializerAnyOf,
+                },
+            };
+        }
+        if (serializableRef.maybeNull) {
+            return {
+                referencedSerializers: serializers,
+                openapi: { anyOf: [...refs, { type: 'null' }] },
+            };
+        }
+        return { referencedSerializers: serializers, openapi: serializerAnyOf };
     }
     /**
      * @internal

package/dist/esm/src/openapi-renderer/helpers/allSerializersFromHandWrittenOpenapi.js

@@ -1,5 +1,5 @@
-import { DreamApp } from '@rvoh/dream';
 import isObject from '../../helpers/isObject.js';
+import serializersAndRefsFromSerializableRef from './serializersAndRefsFromSerializableRef.js';
 /**
  * @internal
  *
@@ -54,8 +54,7 @@ value, serializers) {
         //
     }
     else if (value.$serializable) {
-        const foundSerializers = DreamApp.system.inferSerializersFromDreamClassOrViewModelClass(value.$serializable, value.$serializableSerializerKey);
-        foundSerializers.forEach(serializer => serializers.add(serializer));
+        serializersAndRefsFromSerializableRef(value).serializers.forEach(serializer => serializers.add(serializer));
         //
     }
     else if (isObject(value)) {

package/dist/esm/src/openapi-renderer/helpers/allSerializersToRefsInOpenapi.js

@@ -1,10 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { DreamApp } from '@rvoh/dream';
 import isObject from '../../helpers/isObject.js';
 import SerializerOpenapiRenderer from '../SerializerOpenapiRenderer.js';
+import serializersAndRefsFromSerializableRef from './serializersAndRefsFromSerializableRef.js';
 /**
  * @internal
  *
@@ -69,9 +65,8 @@ function transformValue(value) {
         //
     }
     else if (value.$serializable) {
-        const { $serializable, $serializableSerializerKey, ...rest } = value;
-        const foundSerializers = DreamApp.system.inferSerializersFromDreamClassOrViewModelClass($serializable, $serializableSerializerKey);
-        const refs = foundSerializers.map(serializer => new SerializerOpenapiRenderer(serializer).serializerRef);
+        const { $serializable, $serializableSerializerKey, key, ...rest } = value;
+        const { refs } = serializersAndRefsFromSerializableRef({ $serializable, $serializableSerializerKey, key });
         if (refs.length === 0)
             return rest;
         if (refs.length === 1) {

package/dist/esm/src/openapi-renderer/helpers/serializersAndRefsFromSerializableRef.js

@@ -0,0 +1,17 @@
+import { DreamApp } from '@rvoh/dream';
+import { sortBy, uniq } from '@rvoh/dream/utils';
+import SerializerOpenapiRenderer from '../SerializerOpenapiRenderer.js';
+export default function serializersAndRefsFromSerializableRef(serializableRef, { casing = 'camel', suppressResponseEnums = false, } = {}) {
+    const key = serializableRef.$serializableSerializerKey || serializableRef.key || 'default';
+    const serializerRefs = sortBy(uniq(DreamApp.system.inferSerializersFromDreamClassOrViewModelClass(serializableRef.$serializable, key)).map(serializer => ({
+        serializer,
+        ref: new SerializerOpenapiRenderer(serializer, {
+            casing,
+            suppressResponseEnums,
+        }).serializerRef,
+    })), ({ ref }) => ref.$ref);
+    return {
+        serializers: serializerRefs.map(({ serializer }) => serializer),
+        refs: serializerRefs.map(({ ref }) => ref),
+    };
+}

package/dist/types/src/openapi-renderer/helpers/serializersAndRefsFromSerializableRef.d.ts

@@ -0,0 +1,9 @@
+import { OpenapiSchemaExpressionRef, OpenapiSchemaShorthandExpressionSerializableRef } from '@rvoh/dream/openapi';
+import { DreamModelSerializerType, SerializerCasing, SimpleObjectSerializerType } from '@rvoh/dream/types';
+export default function serializersAndRefsFromSerializableRef(serializableRef: OpenapiSchemaShorthandExpressionSerializableRef, { casing, suppressResponseEnums, }?: {
+    casing?: SerializerCasing;
+    suppressResponseEnums?: boolean;
+}): {
+    serializers: (DreamModelSerializerType | SimpleObjectSerializerType)[];
+    refs: OpenapiSchemaExpressionRef[];
+};

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "author": "RVOHealth",
   "publishConfig": {
     "access": "public"