@penkov/swagger-code-gen 1.6.0 → 1.6.1

package/README.md

@@ -39,6 +39,27 @@ Will generate:
 ```typescript
 // header skipped
 
+async function requestImpl<T>(request: Request, requestOptions: RequestOptions): Promise<T> {
+  const preProcessed = requestOptions.preProcessRequest ? await requestOptions.preProcessRequest(request) : request;
+  const resp = await fetch(preProcessed);
+  const postProcessed = requestOptions.postProcessResponse ? await requestOptions.postProcessResponse(preProcessed, resp) : resp;
+  if (postProcessed.ok) {
+    let json: any = null;
+    if (postProcessed.headers.has('content-length')) {
+      const ct = parseInt(postProcessed.headers.get('content-length'));
+      if (ct > 0) {
+        json = await postProcessed.json()
+      }
+    }
+    return json as T;
+  } else {
+    throw postProcessed;
+  }
+}
+
+
+
+
 export interface Customer {
   readonly id: number;
   readonly username: string;

package/dist/property.js

@@ -24,11 +24,17 @@ export class Property {
             .exists(ref => schemas.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
         const type = option(definition.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
+            .orElse(() => option(definition.allOf)
+            .map(x => Collection.from(x))
+            .filter(x => x.nonEmpty)
+            .map(x => x.flatMapOption(oneOfItem => option(oneOfItem.$ref)
+            .map(ref => ref.substring(SCHEMA_PREFIX.length))
+            .orElseValue(option(oneOfItem.type))).mkString(' & ')))
             .getOrElseValue(definition.type);
-        const nullable = option(definition.nullable).contains(true) ||
+        const nullable = option(definition.nullable).contains(true) || !option(definition.required).contains(true) ||
             (referencesObject && options.referencedObjectsNullableByDefault && !option(definition.nullable).contains(false));
         const description = option(definition.description);
-        const required = option(definition.required).contains(true);
+        const required = option(definition.required).contains(false);
         const items = option(definition.items?.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElseValue(option(definition.items?.type))
@@ -39,6 +45,7 @@ export class Property {
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElseValue(option(oneOfItem.type))).mkString(' | ')))
             .getOrElseValue('any');
+        console.log(`${name}: ${type}`);
         return new Property(name, type, description, null, nullable, required, items, referencesObject, itemReferencesObject);
     }
     get jsType() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"