@rvoh/psychic 0.31.1 → 0.31.2

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

@@ -30,6 +30,7 @@ const dream_1 = require("@rvoh/dream");
 const index_js_1 = __importDefault(require("../psychic-app/index.js"));
 const isBlankDescription_js_1 = __importDefault(require("./helpers/isBlankDescription.js"));
 const primitiveOpenapiStatementToOpenapi_js_1 = __importStar(require("./helpers/primitiveOpenapiStatementToOpenapi.js"));
+const schemaToRef_js_1 = __importDefault(require("./helpers/schemaToRef.js"));
 const serializer_js_1 = __importDefault(require("./serializer.js"));
 class OpenapiBodySegmentRenderer {
     controllerClass;
@@ -93,7 +94,7 @@ class OpenapiBodySegmentRenderer {
             case '$ref':
                 return this.refStatement(bodySegment);
             case '$schema':
-                return this.schemaRefStatement(bodySegment);
+                return (0, schemaToRef_js_1.default)(bodySegment);
             case '$serializer':
                 return this.serializerStatement(bodySegment);
             case '$serializable':
@@ -393,17 +394,6 @@ The following values will be allowed:
             ...serializableRef,
         });
     }
-    /**
-     * @internal
-     *
-     * recursively a $schema statement
-     */
-    schemaRefStatement(bodySegment) {
-        const schemaRefBodySegment = bodySegment;
-        return {
-            $ref: `#/components/schemas/${schemaRefBodySegment.$schema.replace(/^#\/components\/schemas\//, '')}`,
-        };
-    }
     /**
      * @internal
      *

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = schemaToRef;
+function schemaToRef(bodySegment) {
+    const schemaRefBodySegment = bodySegment;
+    return {
+        $ref: `#/components/schemas/${schemaRefBodySegment.$schema.replace(/^#\/components\/schemas\//, '')}`,
+    };
+}

package/dist/cjs/src/openapi-renderer/serializer.js

@@ -9,6 +9,7 @@ const UnexpectedUndefined_js_1 = __importDefault(require("../error/UnexpectedUnd
 const EnvInternal_js_1 = __importDefault(require("../helpers/EnvInternal.js"));
 const index_js_1 = __importDefault(require("../psychic-app/index.js"));
 const body_segment_js_1 = __importDefault(require("./body-segment.js"));
+const schemaToRef_js_1 = __importDefault(require("./helpers/schemaToRef.js"));
 class OpenapiSerializerRenderer {
     openapiName;
     controllerClass;
@@ -129,7 +130,7 @@ Error: ${this.serializerClass.name} missing explicit serializer definition for $
                             {
                                 allOf: [
                                     { ...finalOutputForSerializerKey },
-                                    { anyOf: flattenedPolymorphicSchemas.map(schema => ({ $schema: schema })) },
+                                    { anyOf: flattenedPolymorphicSchemas.map(schema => (0, schemaToRef_js_1.default)({ $schema: schema })) },
                                 ],
                             },
                         ],
@@ -142,7 +143,7 @@ Error: ${this.serializerClass.name} missing explicit serializer definition for $
                     [serializerKey]: {
                         allOf: [
                             { ...finalOutputForSerializerKey },
-                            { anyOf: flattenedPolymorphicSchemas.map(schema => ({ $schema: schema })) },
+                            { anyOf: flattenedPolymorphicSchemas.map(schema => (0, schemaToRef_js_1.default)({ $schema: schema })) },
                         ],
                     },
                 };

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

@@ -2,6 +2,7 @@ import { inferSerializerFromDreamOrViewModel, openapiShorthandPrimitiveTypes, }
 import PsychicApp from '../psychic-app/index.js';
 import isBlankDescription from './helpers/isBlankDescription.js';
 import primitiveOpenapiStatementToOpenapi, { maybeNullPrimitiveToPrimitive, } from './helpers/primitiveOpenapiStatementToOpenapi.js';
+import schemaToRef from './helpers/schemaToRef.js';
 import OpenapiSerializerRenderer from './serializer.js';
 export default class OpenapiBodySegmentRenderer {
     controllerClass;
@@ -65,7 +66,7 @@ export default class OpenapiBodySegmentRenderer {
             case '$ref':
                 return this.refStatement(bodySegment);
             case '$schema':
-                return this.schemaRefStatement(bodySegment);
+                return schemaToRef(bodySegment);
             case '$serializer':
                 return this.serializerStatement(bodySegment);
             case '$serializable':
@@ -365,17 +366,6 @@ The following values will be allowed:
             ...serializableRef,
         });
     }
-    /**
-     * @internal
-     *
-     * recursively a $schema statement
-     */
-    schemaRefStatement(bodySegment) {
-        const schemaRefBodySegment = bodySegment;
-        return {
-            $ref: `#/components/schemas/${schemaRefBodySegment.$schema.replace(/^#\/components\/schemas\//, '')}`,
-        };
-    }
     /**
      * @internal
      *

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

@@ -0,0 +1,6 @@
+export default function schemaToRef(bodySegment) {
+    const schemaRefBodySegment = bodySegment;
+    return {
+        $ref: `#/components/schemas/${schemaRefBodySegment.$schema.replace(/^#\/components\/schemas\//, '')}`,
+    };
+}

package/dist/esm/src/openapi-renderer/serializer.js

@@ -4,6 +4,7 @@ import UnexpectedUndefined from '../error/UnexpectedUndefined.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import PsychicApp from '../psychic-app/index.js';
 import OpenapiBodySegmentRenderer from './body-segment.js';
+import schemaToRef from './helpers/schemaToRef.js';
 export default class OpenapiSerializerRenderer {
     openapiName;
     controllerClass;
@@ -124,7 +125,7 @@ Error: ${this.serializerClass.name} missing explicit serializer definition for $
                             {
                                 allOf: [
                                     { ...finalOutputForSerializerKey },
-                                    { anyOf: flattenedPolymorphicSchemas.map(schema => ({ $schema: schema })) },
+                                    { anyOf: flattenedPolymorphicSchemas.map(schema => schemaToRef({ $schema: schema })) },
                                 ],
                             },
                         ],
@@ -137,7 +138,7 @@ Error: ${this.serializerClass.name} missing explicit serializer definition for $
                     [serializerKey]: {
                         allOf: [
                             { ...finalOutputForSerializerKey },
-                            { anyOf: flattenedPolymorphicSchemas.map(schema => ({ $schema: schema })) },
+                            { anyOf: flattenedPolymorphicSchemas.map(schema => schemaToRef({ $schema: schema })) },
                         ],
                     },
                 };

package/dist/types/src/openapi-renderer/body-segment.d.ts

@@ -109,12 +109,6 @@ export default class OpenapiBodySegmentRenderer {
      */
     private serializerStatement;
     private serializableStatement;
-    /**
-     * @internal
-     *
-     * recursively a $schema statement
-     */
-    private schemaRefStatement;
     /**
      * @internal
      *

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

@@ -0,0 +1,3 @@
+import { OpenapiSchemaExpressionRef } from '@rvoh/dream';
+import { OpenapiBodySegment } from '../body-segment.js';
+export default function schemaToRef(bodySegment: OpenapiBodySegment): OpenapiSchemaExpressionRef;

package/dist/types/src/openapi-renderer/serializer.d.ts

@@ -1,5 +1,6 @@
-import { DreamSerializer, OpenapiSchemaBody, OpenapiSchemaBodyShorthand, OpenapiSchemaObject, OpenapiShorthandPrimitiveTypes } from '@rvoh/dream';
+import { DreamSerializer, OpenapiSchemaObject } from '@rvoh/dream';
 import PsychicController from '../controller/index.js';
+import { OpenapiBodyTarget } from './body-segment.js';
 export default class OpenapiSerializerRenderer {
     private openapiName;
     private controllerClass;
@@ -64,13 +65,3 @@ export default class OpenapiSerializerRenderer {
     private addMultiSerializerAssociationToOutput;
     private accountForNullableOption;
 }
-export type OpenapiEndpointParseResults = {
-    results: OpenapiSchemaBody;
-    extraComponents: {
-        [key: string]: OpenapiSchemaObject;
-    };
-};
-export type OpenapiBodySegment = OpenapiSchemaBodyShorthand | OpenapiShorthandPrimitiveTypes | {
-    description: string;
-} | undefined;
-export type OpenapiBodyTarget = 'request' | 'response';

package/package.json

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