@mittwald/api-code-generator 4.136.1 → 4.199.1

package/dist/esm/generation/model/components/Schemas.js

@@ -1,6 +1,7 @@
 import { JSONSchema } from "../global/JSONSchema.js";
 import { Name } from "../global/Name.js";
 import { asyncStringJoin } from "../../asyncStringJoin.js";
+import { populateNullableTypes } from "../../populateNullableTypes.js";
 export class Schemas {
     static ns = "Schemas";
     schemas;
@@ -9,7 +10,9 @@ export class Schemas {
     constructor(components, schemas) {
         this.components = components;
         this.name = new Name(Schemas.ns, components.name);
-        this.schemas = Object.entries(schemas ?? {}).map(([schemaName, schema]) => new JSONSchema(new Name(schemaName, this.name), schema));
+        this.schemas = Object.entries(schemas ?? {}).map(([schemaName, schema]) => {
+            return new JSONSchema(new Name(schemaName, this.name), populateNullableTypes(schema));
+        });
     }
     async compileTypes(opts) {
         const t = {

package/dist/esm/generation/model/components/SecurityScheme.js

@@ -6,16 +6,17 @@ export class SecurityScheme {
     jsonSchema;
     constructor(schemes, name, doc) {
         this.name = new Name(name, schemes.name);
-        this.in = doc.in;
+        this.in = doc.type === "http" ? "header" : doc.in;
+        const propName = doc.type === "http" ? "Authorization" : doc.name;
         this.jsonSchema = new JSONSchema(this.name, {
             type: "object",
             description: doc.description,
             properties: {
-                [doc.name]: {
+                [propName]: {
                     type: "string",
                 },
             },
-            required: [doc.name],
+            required: [propName],
         });
     }
 }

package/dist/esm/generation/populateNullableTypes.js

@@ -0,0 +1,26 @@
+export function populateNullableTypes(schema) {
+    if (!schema || "$ref" in schema) {
+        return schema;
+    }
+    if (schema.properties) {
+        for (const key in schema.properties) {
+            schema.properties[key] = populateNullableTypes(schema.properties[key]);
+        }
+    }
+    if ("items" in schema && schema.items) {
+        schema.items = populateNullableTypes(schema.items);
+    }
+    const compositionKeys = ["allOf", "anyOf", "oneOf"];
+    compositionKeys.forEach((key) => {
+        const entries = schema[key];
+        if (Array.isArray(entries)) {
+            schema[key] = entries.map(populateNullableTypes);
+        }
+    });
+    if (schema.nullable) {
+        return {
+            anyOf: [schema, { type: "null" }],
+        };
+    }
+    return schema;
+}

package/dist/types/generation/model/components/SecurityScheme.d.ts

@@ -2,9 +2,10 @@ import { OpenAPIV3 } from "openapi-types";
 import { Name } from "../global/Name.js";
 import { SecuritySchemes } from "./SecuritySchemes.js";
 import { JSONSchema } from "../global/JSONSchema.js";
+export type SecuritySchemeType = OpenAPIV3.ApiKeySecurityScheme | OpenAPIV3.HttpSecurityScheme;
 export declare class SecurityScheme {
     readonly in: string;
     readonly name: Name;
     readonly jsonSchema: JSONSchema;
-    constructor(schemes: SecuritySchemes, name: string, doc: OpenAPIV3.ApiKeySecurityScheme);
+    constructor(schemes: SecuritySchemes, name: string, doc: SecuritySchemeType);
 }

package/dist/types/generation/populateNullableTypes.d.ts

@@ -0,0 +1,2 @@
+import { OpenAPIV3 } from "openapi-types";
+export declare function populateNullableTypes(schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject): OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/api-code-generator",
-  "version": "4.136.1",
+  "version": "4.199.1",
   "type": "module",
   "repository": "https://github.com/mittwald/api-client-js.git",
   "license": "MIT",
@@ -84,5 +84,5 @@
       "@oclif/plugin-plugins"
     ]
   },
-  "gitHead": "37f84150b556ddbdaa705b6ff1969c4e7fef3d52"
+  "gitHead": "2f8c39cf188e9b866a48003394ef2d0fe77d250f"
 }