npm - @kubb/swagger-ts - Versions diffs - 1.0.2 → 1.1.0 - Mend

@kubb/swagger-ts 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.cjs +26 -20
package/dist/index.js +26 -20
package/package.json +4 -4
package/src/generators/TypeGenerator.ts +34 -24

package/dist/index.cjs CHANGED Viewed

@@ -172,33 +172,39 @@ var _TypeGenerator = class extends core.SchemaGenerator {
     }
     if (schema.oneOf) {
       const schemaWithoutOneOf = { ...schema, oneOf: void 0 };
+      const union = factory2.createParenthesizedType(
+        tsCodegen.createUnionDeclaration({
+          nodes: schema.oneOf.map((item) => {
+            return this.getBaseTypeFromSchema(item);
+          }).filter(Boolean)
+        })
+      );
+      if (schemaWithoutOneOf.properties) {
+        return tsCodegen.createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean)
+        });
+      }
       return tsCodegen.createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName),
-          factory2.createParenthesizedType(
-            tsCodegen.createUnionDeclaration({
-              nodes: schema.oneOf.map((item) => {
-                return this.getBaseTypeFromSchema(item);
-              }).filter(Boolean)
-            })
-          )
-        ].filter(Boolean)
+        nodes: [union]
       });
     }
     if (schema.anyOf) ;
     if (schema.allOf) {
       const schemaWithoutAllOf = { ...schema, allOf: void 0 };
+      const and = factory2.createParenthesizedType(
+        factory2.createIntersectionTypeNode(
+          schema.allOf.map((item) => {
+            return this.getBaseTypeFromSchema(item);
+          }).filter(Boolean)
+        )
+      );
+      if (schemaWithoutAllOf.properties) {
+        return tsCodegen.createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean)
+        });
+      }
       return tsCodegen.createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName),
-          factory2.createParenthesizedType(
-            factory2.createIntersectionTypeNode(
-              schema.allOf.map((item) => {
-                return this.getBaseTypeFromSchema(item);
-              }).filter(Boolean)
-            )
-          )
-        ].filter(Boolean)
+        nodes: [and]
       });
     }
     if (schema.enum && baseName) {

package/dist/index.js CHANGED Viewed

@@ -162,33 +162,39 @@ var _TypeGenerator = class extends SchemaGenerator {
     }
     if (schema.oneOf) {
       const schemaWithoutOneOf = { ...schema, oneOf: void 0 };
+      const union = factory2.createParenthesizedType(
+        createUnionDeclaration({
+          nodes: schema.oneOf.map((item) => {
+            return this.getBaseTypeFromSchema(item);
+          }).filter(Boolean)
+        })
+      );
+      if (schemaWithoutOneOf.properties) {
+        return createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean)
+        });
+      }
       return createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName),
-          factory2.createParenthesizedType(
-            createUnionDeclaration({
-              nodes: schema.oneOf.map((item) => {
-                return this.getBaseTypeFromSchema(item);
-              }).filter(Boolean)
-            })
-          )
-        ].filter(Boolean)
+        nodes: [union]
       });
     }
     if (schema.anyOf) ;
     if (schema.allOf) {
       const schemaWithoutAllOf = { ...schema, allOf: void 0 };
+      const and = factory2.createParenthesizedType(
+        factory2.createIntersectionTypeNode(
+          schema.allOf.map((item) => {
+            return this.getBaseTypeFromSchema(item);
+          }).filter(Boolean)
+        )
+      );
+      if (schemaWithoutAllOf.properties) {
+        return createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean)
+        });
+      }
       return createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName),
-          factory2.createParenthesizedType(
-            factory2.createIntersectionTypeNode(
-              schema.allOf.map((item) => {
-                return this.getBaseTypeFromSchema(item);
-              }).filter(Boolean)
-            )
-          )
-        ].filter(Boolean)
+        nodes: [and]
       });
     }
     if (schema.enum && baseName) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/swagger-ts",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Generator swagger-ts",
   "repository": {
     "type": "git",
@@ -41,9 +41,9 @@
     "change-case": "^4.1.2",
     "lodash.uniqueid": "^4.0.1",
     "typescript": "^5.1.3",
-    "@kubb/core": "1.0.2",
-    "@kubb/swagger": "1.0.2",
-    "@kubb/ts-codegen": "1.0.2"
+    "@kubb/core": "1.1.0",
+    "@kubb/swagger": "1.1.0",
+    "@kubb/ts-codegen": "1.1.0"
   },
   "devDependencies": {
     "@types/lodash.uniqueid": "^4.0.7",

package/src/generators/TypeGenerator.ts CHANGED Viewed

@@ -205,19 +205,24 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
       // union
       const schemaWithoutOneOf = { ...schema, oneOf: undefined }
-      return createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName),
-          factory.createParenthesizedType(
-            createUnionDeclaration({
-              nodes: schema.oneOf
-                .map((item) => {
-                  return this.getBaseTypeFromSchema(item)
-                })
-                .filter(Boolean) as ts.TypeNode[],
+      const union = factory.createParenthesizedType(
+        createUnionDeclaration({
+          nodes: schema.oneOf
+            .map((item) => {
+              return this.getBaseTypeFromSchema(item)
             })
-          ),
-        ].filter(Boolean) as ts.TypeNode[],
+            .filter(Boolean) as ts.TypeNode[],
+        })
+      )
+      if (schemaWithoutOneOf.properties) {
+        return createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean) as ts.TypeNode[],
+        })
+      }
+      return createIntersectionDeclaration({
+        nodes: [union],
       })
     }
@@ -228,19 +233,24 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
       // intersection/add
       const schemaWithoutAllOf = { ...schema, allOf: undefined }
+      const and = factory.createParenthesizedType(
+        factory.createIntersectionTypeNode(
+          schema.allOf
+            .map((item) => {
+              return this.getBaseTypeFromSchema(item)
+            })
+            .filter(Boolean) as ts.TypeNode[]
+        )
+      )
+      if (schemaWithoutAllOf.properties) {
+        return createIntersectionDeclaration({
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean) as ts.TypeNode[],
+        })
+      }
       return createIntersectionDeclaration({
-        nodes: [
-          this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName),
-          factory.createParenthesizedType(
-            factory.createIntersectionTypeNode(
-              schema.allOf
-                .map((item) => {
-                  return this.getBaseTypeFromSchema(item)
-                })
-                .filter(Boolean) as ts.TypeNode[]
-            )
-          ),
-        ].filter(Boolean) as ts.TypeNode[],
+        nodes: [and],
       })
     }