Skip to content

Commit 7ba3b91

Browse files
committed
Merge remote-tracking branch 'upstream/master' into csnw
2 parents fede3b4 + 118d6a8 commit 7ba3b91

30 files changed

+1378
-1829
lines changed

.yarn/releases/yarn-3.2.2.cjs

-783
This file was deleted.

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
*Note: This is a partial changelog, covering significant & breaking changes. For a full list of changes, please consult the [commit log](https://github.com/bcherny/json-schema-to-typescript/commits).
44

5+
## 15.0.0
6+
7+
- 62cc052 Fixed bug where intersection schemas didn't generate complete types. Improved output readability for intersection types (#603)
8+
9+
## 14.1.0
10+
11+
- 3e2e1e9 Added `inferStringEnumKeysFromValues` option (#578)
12+
13+
## 14.0.5
14+
15+
- b7fee29 Added .yaml support for CLI (#598)
16+
517
## 14.0.2
618

719
- 9ec0c70 Added .yaml support (#577)

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,11 @@ See [server demo](example) and [browser demo](https://github.com/bcherny/json-sc
134134
|-|-|-|-|
135135
| additionalProperties | boolean | `true` | Default value for `additionalProperties`, when it is not explicitly set |
136136
| bannerComment | string | `"/* eslint-disable */\n/**\n* This file was automatically generated by json-schema-to-typescript.\n* DO NOT MODIFY IT BY HAND. Instead, modify the source JSON Schema file,\n* and run json-schema-to-typescript to regenerate this file.\n*/"` | Disclaimer comment prepended to the top of each generated file |
137-
| customName | `(LinkedJSONSchema, string | undefined) => string | undefined` | `undefined` | Custom function to provide a type name for a given schema
137+
| customName | `(LinkedJSONSchema, string \| undefined) => string \| undefined` | `undefined` | Custom function to provide a type name for a given schema
138138
| cwd | string | `process.cwd()` | Root directory for resolving [`$ref`](https://tools.ietf.org/id/draft-pbryan-zyp-json-ref-03.html)s |
139139
| declareExternallyReferenced | boolean | `true` | Declare external schemas referenced via `$ref`? |
140140
| enableConstEnums | boolean | `true` | Prepend enums with [`const`](https://www.typescriptlang.org/docs/handbook/enums.html#computed-and-constant-members)? |
141+
| inferStringEnumKeysFromValues | boolean | `false` | Create enums from JSON enums with eponymous keys |
141142
| format | boolean | `true` | Format code? Set this to `false` to improve performance. |
142143
| ignoreMinAndMaxItems | boolean | `false` | Ignore maxItems and minItems for `array` types, preventing tuples being generated. |
143144
| maxItems | number | `20` | Maximum number of unioned tuples to emit when representing bounded-size array types, before falling back to emitting unbounded arrays. Increase this to improve precision of emitted types, decrease it to improve performance, or set it to `-1` to ignore `maxItems`.

0 commit comments

Comments
 (0)