equipped 5.0.0-beta.8 → 5.0.0-beta.9

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.0.0-beta.9](https://github.com/kevinand11/equipped/compare/v5.0.0-beta.8...v5.0.0-beta.9) (2024-05-31)
+
+
+### Bug Fixes
+
+* generateJSONSchema ([39031fd](https://github.com/kevinand11/equipped/commit/39031fd7c8d0f18a93c55b3fc542fd33042e4e44))
+
 ## [5.0.0-beta.8](https://github.com/kevinand11/equipped/compare/v5.0.0-beta.7...v5.0.0-beta.8) (2024-05-31)
 
 

package/lib/instance/index.js

@@ -59,8 +59,9 @@ class Instance {
         return __classPrivateFieldGet(this, _Instance_settings, "f");
     }
     static createLogger() {
+        const defaultLogLevel = 'info';
         return (0, pino_1.default)({
-            level: _a.get()?.settings?.logLevel ?? 'info',
+            level: __classPrivateFieldGet(_a, _a, "f", _Instance_initialized) ? _a.get().settings?.logLevel ?? defaultLogLevel : defaultLogLevel,
             serializers: {
                 err: pino_1.default.stdSerializers.err,
                 req: pino_1.default.stdSerializers.req,

package/lib/scripts/json-schema.d.ts

@@ -1,2 +1,6 @@
+import { Options } from 'ts-oas';
 import { RouteSchema } from '../server';
-export declare function generateJSONSchema(patterns: (string | RegExp)[], paths: string[]): Record<string, RouteSchema>;
+export declare function generateJSONSchema(patterns: (string | RegExp)[], paths: string[], options?: {
+    tsConfigPath?: string | Record<string, unknown>;
+    options?: Options;
+}): Record<string, RouteSchema>;

package/lib/scripts/json-schema.js

@@ -27,16 +27,21 @@ exports.generateJSONSchema = void 0;
 const ts_oas_1 = __importStar(require("ts-oas"));
 const instance_1 = require("../instance");
 const fileSchema = { type: 'string', format: 'binary' };
-function generateJSONSchema(patterns, paths) {
-    const tsProgram = (0, ts_oas_1.createProgram)(paths, { strictNullChecks: true });
-    const tsoas = new ts_oas_1.default(tsProgram, { ref: false, ignoreErrors: true });
+function generateJSONSchema(patterns, paths, options) {
+    const tsProgram = (0, ts_oas_1.createProgram)(paths, options?.tsConfigPath);
+    const logger = instance_1.Instance.createLogger();
+    const tsoas = new ts_oas_1.default(tsProgram, {
+        ref: false,
+        nullableKeyword: false,
+        ...(options?.options ?? {})
+    });
     const jsonSchema = tsoas.getSchemas(patterns);
     return Object.entries(jsonSchema)
         .map(([name, { properties: def }]) => {
         try {
             const key = def?.key?.enum?.at(0) ?? name;
             if (!def || !key || !def.method)
-                throw new Error();
+                return [undefined, undefined];
             const response = def.responses.properties ?? def.responses.anyOf?.reduce((acc, cur) => {
                 if (cur.properties)
                     return { ...acc, ...cur.properties };
@@ -58,27 +63,28 @@ function generateJSONSchema(patterns, paths) {
                         body.required.push(key);
                 });
             }
-            const schema = def
-                ? {
-                    body,
-                    params: def.params,
-                    querystring: def.query,
-                    headers: def.headers,
-                    response,
-                    operationId: key,
-                    summary: name,
-                }
-                : undefined;
+            const schema = {
+                body,
+                params: def.params,
+                querystring: def.query,
+                headers: def.headers,
+                response,
+                operationId: key,
+                summary: name,
+            };
             return [key, schema];
         }
         catch (err) {
-            instance_1.Instance.createLogger().warn(`Error parsing ${name}: ${err.message}. Skipping route`);
+            logger.warn(`Error parsing ${name}: ${err.message}. Skipping route`);
             return [undefined, undefined];
         }
     })
         .reduce((acc, [path, schema]) => {
-        if (path && schema)
-            acc[path] = stripEmptyObjects(schema);
+        if (!path || !schema)
+            return acc;
+        if (acc[path])
+            logger.warn(`Duplicate route key '${path}' found for '${acc[path].summary}' & '${schema.summary}'. Make sure to use unique keys for all routes because only the last one will be used.`);
+        acc[path] = stripEmptyObjects(schema);
         return acc;
     }, {});
 }

package/lib/structure/baseEntity.d.ts

@@ -1,5 +1,5 @@
 import { ClassPropertiesWrapper } from 'valleyed';
-export declare class BaseEntity<Keys extends object = object, Ignored extends string = string> extends ClassPropertiesWrapper<Keys> {
+export declare class BaseEntity<Keys extends object = object, Ignored extends string = never> extends ClassPropertiesWrapper<Keys> {
     __hash: string;
     __type: string;
     readonly __ignoreInJSON: Ignored[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "5.0.0-beta.8",
+	"version": "5.0.0-beta.9",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",