@rvoh/psychic 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.5.4
+
+- fix issue when providing the `including` argument exclusively to an OpenAPI decorator's `requestBody`
+
+## 1.5.3
+
+- add missing peer dependency for openapi-typescript, allow BIGINT type when generating openapi-typescript bigints
+
+## 1.5.2
+
+- ensure that bigints are converted to number | string when generating openapi-typescript type files
+
 ## 1.5.1
 
 - fix issue with enum syncing related to multi-db engine support regression

package/dist/cjs/src/bin/helpers/{syncTypescriptOpenapiFiles.js → syncOpenapiTypescriptFiles.js}

@@ -26,14 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = syncTypescriptOpenapiFiles;
+exports.default = syncOpenapiTypescriptFiles;
 const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const openapi_typescript_1 = __importStar(require("openapi-typescript"));
 const typescript_1 = __importDefault(require("typescript"));
 const psychicPath_js_1 = __importDefault(require("../../helpers/path/psychicPath.js"));
 const index_js_1 = __importDefault(require("../../psychic-app/index.js"));
-async function syncTypescriptOpenapiFiles() {
+const BIGINT = typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.BigIntKeyword);
+async function syncOpenapiTypescriptFiles() {
     const psychicApp = index_js_1.default.getOrFail();
     const syncableKeys = Object.keys(psychicApp.openapi).filter(key => psychicApp.openapi[key]?.syncTypes);
     const targetDir = path.join((0, psychicPath_js_1.default)('types'), 'openapi');
@@ -49,8 +50,8 @@ async function syncTypescriptOpenapiFiles() {
                     const isNullable = schemaObject.nullable ||
                         (Array.isArray(schemaObject.type) && schemaObject.type.includes('null'));
                     return isNullable
-                        ? typescript_1.default.factory.createUnionTypeNode([openapi_typescript_1.STRING, openapi_typescript_1.NUMBER, openapi_typescript_1.NULL])
-                        : typescript_1.default.factory.createUnionTypeNode([openapi_typescript_1.STRING, openapi_typescript_1.NUMBER]);
+                        ? typescript_1.default.factory.createUnionTypeNode([openapi_typescript_1.STRING, openapi_typescript_1.NUMBER, BIGINT, openapi_typescript_1.NULL])
+                        : typescript_1.default.factory.createUnionTypeNode([openapi_typescript_1.STRING, openapi_typescript_1.NUMBER, BIGINT]);
                 }
             },
         });

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

@@ -39,7 +39,7 @@ const index_js_2 = __importDefault(require("../server/index.js"));
 const enumsFileStr_js_1 = __importDefault(require("./helpers/enumsFileStr.js"));
 const generateRouteTypes_js_1 = __importDefault(require("./helpers/generateRouteTypes.js"));
 const printRoutes_js_1 = __importDefault(require("./helpers/printRoutes.js"));
-const syncTypescriptOpenapiFiles_js_1 = __importDefault(require("./helpers/syncTypescriptOpenapiFiles.js"));
+const syncOpenapiTypescriptFiles_js_1 = __importDefault(require("./helpers/syncOpenapiTypescriptFiles.js"));
 class PsychicBin {
     static async generateController(controllerName, actions) {
         await (0, controller_js_1.default)({
@@ -92,7 +92,7 @@ class PsychicBin {
     }
     static async syncTypescriptOpenapiFiles() {
         dream_1.DreamCLI.logger.logStartProgress(`syncing openapi types...`);
-        await (0, syncTypescriptOpenapiFiles_js_1.default)();
+        await (0, syncOpenapiTypescriptFiles_js_1.default)();
         dream_1.DreamCLI.logger.logEndProgress();
     }
     static async syncOpenapiJson() {

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

@@ -400,6 +400,8 @@ class OpenapiEndpointRenderer {
             return true;
         if (body.only)
             return true;
+        if (body.including)
+            return true;
         if (body.for)
             return true;
         if (body.required && body.type !== 'object')

package/dist/esm/src/bin/helpers/{syncTypescriptOpenapiFiles.js → syncOpenapiTypescriptFiles.js}

@@ -4,7 +4,8 @@ import openapiTS, { astToString, NULL, NUMBER, STRING } from 'openapi-typescript
 import ts from 'typescript';
 import psychicPath from '../../helpers/path/psychicPath.js';
 import PsychicApp from '../../psychic-app/index.js';
-export default async function syncTypescriptOpenapiFiles() {
+const BIGINT = ts.factory.createKeywordTypeNode(ts.SyntaxKind.BigIntKeyword);
+export default async function syncOpenapiTypescriptFiles() {
     const psychicApp = PsychicApp.getOrFail();
     const syncableKeys = Object.keys(psychicApp.openapi).filter(key => psychicApp.openapi[key]?.syncTypes);
     const targetDir = path.join(psychicPath('types'), 'openapi');
@@ -20,8 +21,8 @@ export default async function syncTypescriptOpenapiFiles() {
                     const isNullable = schemaObject.nullable ||
                         (Array.isArray(schemaObject.type) && schemaObject.type.includes('null'));
                     return isNullable
-                        ? ts.factory.createUnionTypeNode([STRING, NUMBER, NULL])
-                        : ts.factory.createUnionTypeNode([STRING, NUMBER]);
+                        ? ts.factory.createUnionTypeNode([STRING, NUMBER, BIGINT, NULL])
+                        : ts.factory.createUnionTypeNode([STRING, NUMBER, BIGINT]);
                 }
             },
         });

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

@@ -11,7 +11,7 @@ import PsychicServer from '../server/index.js';
 import enumsFileStr from './helpers/enumsFileStr.js';
 import generateRouteTypes from './helpers/generateRouteTypes.js';
 import printRoutes from './helpers/printRoutes.js';
-import syncTypescriptOpenapiFiles from './helpers/syncTypescriptOpenapiFiles.js';
+import syncOpenapiTypescriptFiles from './helpers/syncOpenapiTypescriptFiles.js';
 export default class PsychicBin {
     static async generateController(controllerName, actions) {
         await generateController({
@@ -64,7 +64,7 @@ export default class PsychicBin {
     }
     static async syncTypescriptOpenapiFiles() {
         DreamCLI.logger.logStartProgress(`syncing openapi types...`);
-        await syncTypescriptOpenapiFiles();
+        await syncOpenapiTypescriptFiles();
         DreamCLI.logger.logEndProgress();
     }
     static async syncOpenapiJson() {

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

@@ -394,6 +394,8 @@ export default class OpenapiEndpointRenderer {
             return true;
         if (body.only)
             return true;
+        if (body.including)
+            return true;
         if (body.for)
             return true;
         if (body.required && body.type !== 'object')

package/dist/types/src/bin/helpers/syncOpenapiTypescriptFiles.d.ts

@@ -0,0 +1 @@
+export default function syncOpenapiTypescriptFiles(): Promise<void>;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -54,7 +54,8 @@
     "@rvoh/dream": "*",
     "@types/express": "*",
     "commander": "*",
-    "express": "*"
+    "express": "*",
+    "openapi-typescript": "*"
   },
   "devDependencies": {
     "@eslint/js": "^9.19.0",

package/dist/types/src/bin/helpers/syncTypescriptOpenapiFiles.d.ts

@@ -1 +0,0 @@
-export default function syncTypescriptOpenapiFiles(): Promise<void>;