Merge remote-tracking branch 'origin/main'

kubb-labs · Nov 18, 2024 · 70cea1b · 70cea1b
2 parents 260801e + d0825cc
commit 70cea1b
Show file tree

Hide file tree

Showing 54 changed files with 354 additions and 30 deletions.
diff --git a/.changeset/shy-planes-mate.md b/.changeset/shy-planes-mate.md
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @kubb/cli
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/core@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/cli",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator cli",
   "keywords": [
     "typescript",

diff --git a/packages/config-biome/CHANGELOG.md b/packages/config-biome/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/config-biome
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/config-biome/package.json b/packages/config-biome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/config-biome",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "private": true,
   "type": "module",
   "exports": {

diff --git a/packages/config-ts/CHANGELOG.md b/packages/config-ts/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/config-ts
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/config-ts/package.json b/packages/config-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/config-ts",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "private": true,
   "types": "./reset.d.ts",
   "files": [

diff --git a/packages/config-tsup/CHANGELOG.md b/packages/config-tsup/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/config-tsup
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/config-tsup/package.json b/packages/config-tsup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/config-tsup",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "private": true,
   "sideEffects": false,
   "type": "module",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @kubb/core
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/fs@3.0.8
+  - @kubb/parser-ts@3.0.8
+  - @kubb/types@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator core",
   "keywords": [
     "typescript",

diff --git a/packages/fs/CHANGELOG.md b/packages/fs/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/fs
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/fs/package.json b/packages/fs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/fs",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "FileSystem helpers",
   "keywords": [
     "typescript",

diff --git a/packages/kubb/CHANGELOG.md b/packages/kubb/CHANGELOG.md
@@ -1,5 +1,13 @@
 # kubb
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/cli@3.0.8
+  - @kubb/core@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/kubb/package.json b/packages/kubb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kubb",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "OpenAPI to TypeScript, React-Query, Zod, Zodios, Faker.js, MSW and Axios.",
   "keywords": [
     "typescript",

diff --git a/packages/oas/CHANGELOG.md b/packages/oas/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/oas
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/oas/package.json b/packages/oas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/oas",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Oas helpers",
   "keywords": [
     "typescript",

diff --git a/packages/parser-ts/CHANGELOG.md b/packages/parser-ts/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @kubb/parser-ts
 
+## 3.0.8
+
 ## 3.0.7
 
 ## 3.0.6

diff --git a/packages/parser-ts/package.json b/packages/parser-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/parser-ts",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "TypeScript parser",
   "keywords": [
     "typescript",

diff --git a/packages/plugin-client/CHANGELOG.md b/packages/plugin-client/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @kubb/plugin-client
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`569cff0`](https://github.com/kubb-labs/kubb/commit/569cff0a6402830870c3aab7210acdb123b17c48)]:
+  - @kubb/plugin-zod@3.0.8
+  - @kubb/core@3.0.8
+  - @kubb/fs@3.0.8
+  - @kubb/oas@3.0.8
+  - @kubb/plugin-oas@3.0.8
+  - @kubb/plugin-ts@3.0.8
+  - @kubb/react@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/plugin-client/package.json b/packages/plugin-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-client",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator plugin-client",
   "keywords": [
     "typescript",

diff --git a/packages/plugin-faker/CHANGELOG.md b/packages/plugin-faker/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @kubb/plugin-faker
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/core@3.0.8
+  - @kubb/fs@3.0.8
+  - @kubb/oas@3.0.8
+  - @kubb/plugin-oas@3.0.8
+  - @kubb/plugin-ts@3.0.8
+  - @kubb/react@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/plugin-faker/package.json b/packages/plugin-faker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-faker",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator plugin-faker",
   "keywords": [
     "faker",

diff --git a/packages/plugin-msw/CHANGELOG.md b/packages/plugin-msw/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @kubb/plugin-msw
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/core@3.0.8
+  - @kubb/fs@3.0.8
+  - @kubb/oas@3.0.8
+  - @kubb/plugin-faker@3.0.8
+  - @kubb/plugin-oas@3.0.8
+  - @kubb/plugin-ts@3.0.8
+  - @kubb/react@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/plugin-msw/package.json b/packages/plugin-msw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-msw",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator swagger",
   "keywords": [
     "typescript",

diff --git a/packages/plugin-oas/CHANGELOG.md b/packages/plugin-oas/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @kubb/swagger
 
+## 3.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @kubb/core@3.0.8
+  - @kubb/fs@3.0.8
+  - @kubb/oas@3.0.8
+  - @kubb/react@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

diff --git a/packages/plugin-oas/mocks/petStore.yaml b/packages/plugin-oas/mocks/petStore.yaml
@@ -136,7 +136,22 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/Pet'
-
+    Toy:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+        description:
+          type: string
+          default: null
+          nullable: true
+      default: null
+      nullble: true
     PageSize:
       type: integer
       minimum: 1

diff --git a/packages/plugin-oas/package.json b/packages/plugin-oas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-oas",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Generator swagger",
   "keywords": [
     "typescript",

diff --git a/packages/plugin-oas/src/SchemaGenerator.test.ts b/packages/plugin-oas/src/SchemaGenerator.test.ts
@@ -36,6 +36,16 @@ describe('SchemaGenerator core', async () => {
         unknownType: 'unknown',
       },
     },
+    {
+      name: 'Toy',
+      input: '../mocks/petStore.yaml',
+      path: 'Toy',
+      options: {
+        dateType: 'date',
+        transformers: {},
+        unknownType: 'unknown',
+      },
+    },
     {
       name: 'PageSize',
       input: '../mocks/petStore.yaml',

diff --git a/packages/plugin-oas/src/SchemaGenerator.ts b/packages/plugin-oas/src/SchemaGenerator.ts
@@ -395,8 +395,9 @@ export class SchemaGenerator<
     const min = schema.minimum ?? schema.minLength ?? schema.minItems ?? undefined
     const max = schema.maximum ?? schema.maxLength ?? schema.maxItems ?? undefined
     const nullable = schema.nullable ?? schema['x-nullable'] ?? false
+    const defaultNullAndNullable = schema.default === null && nullable
 
-    if (schema.default !== undefined && !Array.isArray(schema.default)) {
+    if (schema.default !== undefined && !defaultNullAndNullable && !Array.isArray(schema.default)) {
       if (typeof schema.default === 'string') {
         baseItems.push({
           keyword: schemaKeywords.default,