nestjs-openapi 0.1.1 → 0.1.2

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import 'tsx';
-import { g as generate, e as formatValidationResult } from './shared/nestjs-openapi.CCvQ3RSW.mjs';
+import { g as generate, e as formatValidationResult } from './shared/nestjs-openapi.yWMsjl_8.mjs';
 import minimist from 'minimist';
 import { relative } from 'node:path';
 import { createRequire } from 'node:module';
@@ -9,7 +9,7 @@ import 'node:fs';
 import 'ts-morph';
 import 'glob';
 import 'js-yaml';
-import './shared/nestjs-openapi.CzNt1duF.mjs';
+import './shared/nestjs-openapi.CBj9xHZ4.mjs';
 import 'ts-json-schema-generator';
 import 'node:crypto';
 import 'node:url';

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Effect, Context, Layer, Option } from 'effect';
-import { C as ConfigNotFoundError, O as OpenApiGeneratorConfig, a as ConfigError, R as ResolvedConfig, P as ProjectError, b as ProjectInitError, E as EntryNotFoundError, M as MethodInfo, c as OpenApiPaths$1 } from './shared/nestjs-openapi.BYUrTaMo.mjs';
-export { A as AnalysisError, i as ConfigLoadError, j as ConfigValidationError, G as GenerateOptions, k as GeneratorError, H as HttpMethod, I as InvalidMethodError, e as ParameterLocation, f as ResolvedParameter, h as ReturnTypeInfo, d as generateAsync, g as generateEffect } from './shared/nestjs-openapi.BYUrTaMo.mjs';
+import { C as ConfigNotFoundError, O as OpenApiGeneratorConfig, a as ConfigError, R as ResolvedConfig, P as ProjectError, b as ProjectInitError, E as EntryNotFoundError, M as MethodInfo, c as OpenApiPaths$1 } from './shared/nestjs-openapi.OhsaHu32.mjs';
+export { A as AnalysisError, i as ConfigLoadError, j as ConfigValidationError, G as GenerateOptions, k as GeneratorError, H as HttpMethod, I as InvalidMethodError, e as ParameterLocation, f as ResolvedParameter, h as ReturnTypeInfo, d as generateAsync, g as generateEffect } from './shared/nestjs-openapi.OhsaHu32.mjs';
 import { DynamicModule } from '@nestjs/common';
 import { Project, SourceFile, ClassDeclaration, MethodDeclaration, Decorator, Symbol, ObjectLiteralExpression, Expression } from 'ts-morph';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Effect, Context, Layer, Option } from 'effect';
-import { C as ConfigNotFoundError, O as OpenApiGeneratorConfig, a as ConfigError, R as ResolvedConfig, P as ProjectError, b as ProjectInitError, E as EntryNotFoundError, M as MethodInfo, c as OpenApiPaths$1 } from './shared/nestjs-openapi.BYUrTaMo.js';
-export { A as AnalysisError, i as ConfigLoadError, j as ConfigValidationError, G as GenerateOptions, k as GeneratorError, H as HttpMethod, I as InvalidMethodError, e as ParameterLocation, f as ResolvedParameter, h as ReturnTypeInfo, d as generateAsync, g as generateEffect } from './shared/nestjs-openapi.BYUrTaMo.js';
+import { C as ConfigNotFoundError, O as OpenApiGeneratorConfig, a as ConfigError, R as ResolvedConfig, P as ProjectError, b as ProjectInitError, E as EntryNotFoundError, M as MethodInfo, c as OpenApiPaths$1 } from './shared/nestjs-openapi.OhsaHu32.js';
+export { A as AnalysisError, i as ConfigLoadError, j as ConfigValidationError, G as GenerateOptions, k as GeneratorError, H as HttpMethod, I as InvalidMethodError, e as ParameterLocation, f as ResolvedParameter, h as ReturnTypeInfo, d as generateAsync, g as generateEffect } from './shared/nestjs-openapi.OhsaHu32.js';
 import { DynamicModule } from '@nestjs/common';
 import { Project, SourceFile, ClassDeclaration, MethodDeclaration, Decorator, Symbol, ObjectLiteralExpression, Expression } from 'ts-morph';
 

package/dist/index.mjs

@@ -1,10 +1,10 @@
-export { c as categorizeBrokenRefs, d as defineConfig, f as findConfigFile, e as formatValidationResult, g as generate, b as loadAndResolveConfig, a as loadConfig, l as loadConfigFromFile, r as resolveConfig, v as validateSpec } from './shared/nestjs-openapi.CCvQ3RSW.mjs';
+export { c as categorizeBrokenRefs, d as defineConfig, f as findConfigFile, e as formatValidationResult, g as generate, b as loadAndResolveConfig, a as loadConfig, l as loadConfigFromFile, r as resolveConfig, v as validateSpec } from './shared/nestjs-openapi.yWMsjl_8.mjs';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { Module } from '@nestjs/common';
 export { generateAsync, generate as generateEffect } from './internal.mjs';
-import { P as ProjectInitError, E as EntryNotFoundError } from './shared/nestjs-openapi.CzNt1duF.mjs';
-export { a as ConfigLoadError, C as ConfigNotFoundError, b as ConfigValidationError, I as InvalidMethodError, c as getAllControllers, q as getArrayInitializer, o as getControllerMethodInfos, e as getControllerName, d as getControllerPrefix, j as getControllerTags, h as getDecoratorName, k as getHttpDecorator, f as getHttpMethods, m as getMethodInfo, w as getModuleDecoratorArg, z as getModuleMetadata, g as getModules, s as getStringLiteralValue, u as getSymbolFromIdentifier, l as isHttpDecorator, i as isHttpMethod, v as isModuleClass, n as normalizePath, y as resolveArrayOfClasses, x as resolveClassFromExpression, r as resolveClassFromSymbol, t as transformMethod, p as transformMethods } from './shared/nestjs-openapi.CzNt1duF.mjs';
+import { P as ProjectInitError, E as EntryNotFoundError } from './shared/nestjs-openapi.CBj9xHZ4.mjs';
+export { a as ConfigLoadError, C as ConfigNotFoundError, b as ConfigValidationError, I as InvalidMethodError, c as getAllControllers, q as getArrayInitializer, o as getControllerMethodInfos, e as getControllerName, d as getControllerPrefix, j as getControllerTags, h as getDecoratorName, k as getHttpDecorator, f as getHttpMethods, m as getMethodInfo, w as getModuleDecoratorArg, z as getModuleMetadata, g as getModules, s as getStringLiteralValue, u as getSymbolFromIdentifier, l as isHttpDecorator, i as isHttpMethod, v as isModuleClass, n as normalizePath, y as resolveArrayOfClasses, x as resolveClassFromExpression, r as resolveClassFromSymbol, t as transformMethod, p as transformMethods } from './shared/nestjs-openapi.CBj9xHZ4.mjs';
 import { Context, Effect, Layer } from 'effect';
 import { Project } from 'ts-morph';
 import 'glob';

package/dist/internal.d.mts

@@ -1,2 +1,2 @@
 import 'effect';
-export { G as GenerateOptions, g as generate, d as generateAsync } from './shared/nestjs-openapi.BYUrTaMo.mjs';
+export { G as GenerateOptions, g as generate, d as generateAsync } from './shared/nestjs-openapi.OhsaHu32.mjs';

package/dist/internal.d.ts

@@ -1,2 +1,2 @@
 import 'effect';
-export { G as GenerateOptions, g as generate, d as generateAsync } from './shared/nestjs-openapi.BYUrTaMo.js';
+export { G as GenerateOptions, g as generate, d as generateAsync } from './shared/nestjs-openapi.OhsaHu32.js';

package/dist/internal.mjs

@@ -1,6 +1,6 @@
 import { Effect } from 'effect';
 import { Project } from 'ts-morph';
-import { E as EntryNotFoundError, g as getModules, o as getControllerMethodInfos, p as transformMethods } from './shared/nestjs-openapi.CzNt1duF.mjs';
+import { E as EntryNotFoundError, g as getModules, o as getControllerMethodInfos, p as transformMethods } from './shared/nestjs-openapi.CBj9xHZ4.mjs';
 
 const generate = (options) => Effect.gen(function* () {
   yield* Effect.logInfo("Starting OpenAPI generation").pipe(

package/dist/shared/{nestjs-openapi.CzNt1duF.mjs → nestjs-openapi.CBj9xHZ4.mjs}

@@ -1306,10 +1306,16 @@ const tsTypeToOpenApiSchema = (tsType) => {
     }
   }
   if (trimmed.includes(" | ")) {
-    const types = trimmed.split(" | ").map((t) => t.trim());
-    return {
-      oneOf: types.map((type) => tsTypeToOpenApiSchema(type))
-    };
+    const allMembers = trimmed.split(" | ").map((t) => t.trim());
+    const hasNull = allMembers.includes("null");
+    const types = allMembers.filter((t) => t !== "undefined" && t !== "null");
+    if (types.length === 0) return { type: "object" };
+    const schema = types.length === 1 ? tsTypeToOpenApiSchema(types[0]) : { oneOf: types.map((type) => tsTypeToOpenApiSchema(type)) };
+    if (!hasNull) return schema;
+    if (schema.$ref) {
+      return { allOf: [{ $ref: schema.$ref }], nullable: true };
+    }
+    return { ...schema, nullable: true };
   }
   switch (trimmed.toLowerCase()) {
     case "string":

package/dist/shared/{nestjs-openapi.BYUrTaMo.d.mts → nestjs-openapi.OhsaHu32.d.mts}

@@ -173,9 +173,12 @@ interface OpenApiSchema {
     readonly format?: string;
     readonly $ref?: string;
     readonly oneOf?: readonly OpenApiSchema[];
+    readonly allOf?: readonly OpenApiSchema[];
     readonly items?: OpenApiSchema;
     readonly properties?: Record<string, OpenApiSchema>;
     readonly required?: readonly string[];
+    /** OpenAPI 3.0 nullable flag */
+    readonly nullable?: boolean;
 }
 declare const OpenApiOperation: Schema.Struct<{
     operationId: typeof Schema.String;

package/dist/shared/{nestjs-openapi.BYUrTaMo.d.ts → nestjs-openapi.OhsaHu32.d.ts}

@@ -173,9 +173,12 @@ interface OpenApiSchema {
     readonly format?: string;
     readonly $ref?: string;
     readonly oneOf?: readonly OpenApiSchema[];
+    readonly allOf?: readonly OpenApiSchema[];
     readonly items?: OpenApiSchema;
     readonly properties?: Record<string, OpenApiSchema>;
     readonly required?: readonly string[];
+    /** OpenAPI 3.0 nullable flag */
+    readonly nullable?: boolean;
 }
 declare const OpenApiOperation: Schema.Struct<{
     operationId: typeof Schema.String;

package/dist/shared/{nestjs-openapi.CCvQ3RSW.mjs → nestjs-openapi.yWMsjl_8.mjs}

@@ -4,7 +4,7 @@ import { join, dirname, resolve } from 'node:path';
 import { Project } from 'ts-morph';
 import { globSync, glob } from 'glob';
 import yaml from 'js-yaml';
-import { C as ConfigNotFoundError, a as ConfigLoadError, b as ConfigValidationError, p as transformMethods, A as extractClassConstraints, B as getRequiredProperties, D as mergeValidationConstraints, E as EntryNotFoundError, g as getModules, o as getControllerMethodInfos } from './nestjs-openapi.CzNt1duF.mjs';
+import { C as ConfigNotFoundError, a as ConfigLoadError, b as ConfigValidationError, p as transformMethods, A as extractClassConstraints, B as getRequiredProperties, D as mergeValidationConstraints, E as EntryNotFoundError, g as getModules, o as getControllerMethodInfos } from './nestjs-openapi.CBj9xHZ4.mjs';
 import { createGenerator } from 'ts-json-schema-generator';
 import { randomUUID } from 'node:crypto';
 import { pathToFileURL } from 'node:url';
@@ -466,6 +466,12 @@ const extractReferencedSchemas = (paths) => {
     if (schema.oneOf) {
       schema.oneOf.forEach(extractFromSchema);
     }
+    if (schema.allOf) {
+      schema.allOf.forEach(extractFromSchema);
+    }
+    if (schema.anyOf) {
+      schema.anyOf.forEach(extractFromSchema);
+    }
     if (schema.properties) {
       Object.values(schema.properties).forEach(extractFromSchema);
     }
@@ -529,7 +535,14 @@ const extractNestedReferences = (schemas, knownSchemas) => {
 };
 const convertToOpenApiSchema = (schema) => {
   const result = {};
-  if (schema.type) result["type"] = schema.type;
+  if (Array.isArray(schema.type)) {
+    const nonNull = schema.type.filter((t) => t !== "null");
+    const isNullable = nonNull.length < schema.type.length;
+    result["type"] = nonNull.length === 1 ? nonNull[0] : schema.type;
+    if (isNullable && nonNull.length === 1) result["nullable"] = true;
+  } else if (schema.type) {
+    result["type"] = schema.type;
+  }
   if (schema.format) result["format"] = schema.format;
   if (schema.$ref) {
     result["$ref"] = schema.$ref.replace(
@@ -700,14 +713,81 @@ const transformSchemasForVersion = (schemas, version) => {
     ])
   );
 };
+const transformOperationToV31 = (operation) => {
+  const parameters = operation.parameters?.map((param) => ({
+    ...param,
+    schema: transformSchemaToV31(param.schema)
+  }));
+  const requestBody = operation.requestBody ? {
+    ...operation.requestBody,
+    content: Object.fromEntries(
+      Object.entries(operation.requestBody.content).map(
+        ([contentType, mediaType]) => [
+          contentType,
+          { ...mediaType, schema: transformSchemaToV31(mediaType.schema) }
+        ]
+      )
+    )
+  } : void 0;
+  const responses = Object.fromEntries(
+    Object.entries(operation.responses).map(([code, response]) => [
+      code,
+      response.content ? {
+        ...response,
+        content: Object.fromEntries(
+          Object.entries(response.content).map(
+            ([contentType, mediaType]) => [
+              contentType,
+              {
+                ...mediaType,
+                schema: transformSchemaToV31(mediaType.schema)
+              }
+            ]
+          )
+        )
+      } : response
+    ])
+  );
+  return {
+    ...operation,
+    ...parameters && { parameters },
+    ...requestBody && { requestBody },
+    responses
+  };
+};
+const HTTP_METHODS = /* @__PURE__ */ new Set([
+  "get",
+  "put",
+  "post",
+  "delete",
+  "options",
+  "head",
+  "patch",
+  "trace"
+]);
+const transformPathsForVersion = (paths, version) => {
+  if (version === "3.0.3") return paths;
+  return Object.fromEntries(
+    Object.entries(paths).map(([path, pathItem]) => [
+      path,
+      Object.fromEntries(
+        Object.entries(pathItem).map(
+          ([key, value]) => HTTP_METHODS.has(key) ? [key, transformOperationToV31(value)] : [key, value]
+        )
+      )
+    ])
+  );
+};
 const transformSpecForVersion = (spec, version) => {
   if (version === "3.0.3") {
     return { ...spec, openapi: version };
   }
   const transformedSchemas = spec.components?.schemas ? transformSchemasForVersion(spec.components.schemas, version) : void 0;
+  const transformedPaths = transformPathsForVersion(spec.paths, version);
   return {
     ...spec,
     openapi: version,
+    paths: transformedPaths,
     ...transformedSchemas && {
       components: {
         ...spec.components,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-openapi",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Static code analysis tool to generate OpenAPI specifications from NestJS applications",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",