ts-json-schema-generator 0.97.0-next.2 → 0.97.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.
- package/CHANGELOG.md +188 -0
- package/dist/factory/program.js +1 -1
- package/dist/factory/program.js.map +1 -1
- package/dist/package.json +2 -4
- package/dist/src/NodeParser/CallExpressionParser.js +4 -0
- package/dist/src/NodeParser/CallExpressionParser.js.map +1 -1
- package/dist/src/NodeParser.js +2 -2
- package/dist/src/NodeParser.js.map +1 -1
- package/dist/src/Utils/intersectionOfArrays.js +3 -3
- package/dist/src/Utils/intersectionOfArrays.js.map +1 -1
- package/dist/src/Utils/nodeKey.js +2 -2
- package/dist/src/Utils/nodeKey.js.map +1 -1
- package/dist/ts-json-schema-generator.js +7 -7
- package/dist/ts-json-schema-generator.js.map +1 -1
- package/factory/program.ts +1 -1
- package/package.json +2 -4
- package/src/NodeParser/CallExpressionParser.ts +6 -0
- package/src/NodeParser.ts +1 -1
- package/src/Utils/intersectionOfArrays.ts +1 -1
- package/src/Utils/nodeKey.ts +1 -1
- package/ts-json-schema-generator.ts +7 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,191 @@
|
|
|
1
|
+
# v0.97.0 (Thu Nov 04 2021)
|
|
2
|
+
|
|
3
|
+
:tada: This release contains work from new contributors! :tada:
|
|
4
|
+
|
|
5
|
+
Thanks for all your work!
|
|
6
|
+
|
|
7
|
+
:heart: Josh Kelley ([@joshkel](https://github.com/joshkel))
|
|
8
|
+
|
|
9
|
+
:heart: Skip Hendriks ([@SkipHendriks](https://github.com/SkipHendriks))
|
|
10
|
+
|
|
11
|
+
:heart: Mohamed Akram ([@mohd-akram](https://github.com/mohd-akram))
|
|
12
|
+
|
|
13
|
+
:heart: Ruben Bridgewater ([@BridgeAR](https://github.com/BridgeAR))
|
|
14
|
+
|
|
15
|
+
#### 🚀 Enhancement
|
|
16
|
+
|
|
17
|
+
- feat: Add directory creation to --out [#1000](https://github.com/vega/ts-json-schema-generator/pull/1000) ([@SkipHendriks](https://github.com/SkipHendriks))
|
|
18
|
+
- feat: improve handling of unique symbols [#989](https://github.com/vega/ts-json-schema-generator/pull/989) ([@joshkel](https://github.com/joshkel))
|
|
19
|
+
- feat: handle intersections of aliased unions [#985](https://github.com/vega/ts-json-schema-generator/pull/985) ([@joshkel](https://github.com/joshkel))
|
|
20
|
+
|
|
21
|
+
#### 🐛 Bug Fix
|
|
22
|
+
|
|
23
|
+
- chore: replace stable stringify packages with safe-stable-stringify [#1009](https://github.com/vega/ts-json-schema-generator/pull/1009) ([@BridgeAR](https://github.com/BridgeAR))
|
|
24
|
+
- fix: pass absolute path of config to ts [#1010](https://github.com/vega/ts-json-schema-generator/pull/1010) ([@mohd-akram](https://github.com/mohd-akram))
|
|
25
|
+
- fix: json tags that are not json do not default to text [#984](https://github.com/vega/ts-json-schema-generator/pull/984) ([@stevenlandis-rl](https://github.com/stevenlandis-rl))
|
|
26
|
+
- fix: remove sourceRoot [#986](https://github.com/vega/ts-json-schema-generator/pull/986) ([@joshkel](https://github.com/joshkel))
|
|
27
|
+
- chore(release): use bot email for making auto commits [#983](https://github.com/vega/ts-json-schema-generator/pull/983) ([@hydrosquall](https://github.com/hydrosquall))
|
|
28
|
+
- ci: add caching [#982](https://github.com/vega/ts-json-schema-generator/pull/982) ([@domoritz](https://github.com/domoritz))
|
|
29
|
+
- chore: upgrade deps, fix workflow merge [#978](https://github.com/vega/ts-json-schema-generator/pull/978) ([@domoritz](https://github.com/domoritz))
|
|
30
|
+
|
|
31
|
+
#### 🔩 Dependency Updates
|
|
32
|
+
|
|
33
|
+
- chore(deps-dev): bump @babel/preset-typescript from 7.15.0 to 7.16.0 [#1003](https://github.com/vega/ts-json-schema-generator/pull/1003) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
34
|
+
- chore(deps-dev): bump @babel/preset-env from 7.15.8 to 7.16.0 [#1006](https://github.com/vega/ts-json-schema-generator/pull/1006) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
35
|
+
- chore(deps-dev): bump @auto-it/first-time-contributor from 10.32.1 to 10.32.2 [#1002](https://github.com/vega/ts-json-schema-generator/pull/1002) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
36
|
+
- chore(deps-dev): bump auto from 10.32.1 to 10.32.2 [#1004](https://github.com/vega/ts-json-schema-generator/pull/1004) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
37
|
+
- chore(deps-dev): bump @types/node from 16.11.4 to 16.11.6 [#1005](https://github.com/vega/ts-json-schema-generator/pull/1005) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
38
|
+
- chore(deps-dev): bump @auto-it/conventional-commits from 10.32.1 to 10.32.2 [#1007](https://github.com/vega/ts-json-schema-generator/pull/1007) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
39
|
+
- chore(deps-dev): bump @babel/core from 7.15.8 to 7.16.0 [#1008](https://github.com/vega/ts-json-schema-generator/pull/1008) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
40
|
+
- chore(deps-dev): bump @types/glob from 7.1.4 to 7.2.0 [#995](https://github.com/vega/ts-json-schema-generator/pull/995) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
41
|
+
- chore(deps-dev): bump jest from 27.2.5 to 27.3.1 [#996](https://github.com/vega/ts-json-schema-generator/pull/996) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
42
|
+
- chore(deps-dev): bump @types/node from 16.11.1 to 16.11.4 [#997](https://github.com/vega/ts-json-schema-generator/pull/997) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
43
|
+
- chore(deps): bump commander from 8.2.0 to 8.3.0 [#998](https://github.com/vega/ts-json-schema-generator/pull/998) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
44
|
+
- chore(deps-dev): bump ts-node from 10.3.0 to 10.4.0 [#999](https://github.com/vega/ts-json-schema-generator/pull/999) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
45
|
+
- chore(deps-dev): bump ts-node from 10.2.1 to 10.3.0 [#991](https://github.com/vega/ts-json-schema-generator/pull/991) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
46
|
+
- chore(deps): bump typescript from 4.4.3 to 4.4.4 [#990](https://github.com/vega/ts-json-schema-generator/pull/990) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
47
|
+
- chore(deps-dev): bump @types/node from 16.10.3 to 16.11.1 [#992](https://github.com/vega/ts-json-schema-generator/pull/992) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
48
|
+
- chore(deps-dev): bump jest from 27.2.4 to 27.2.5 [#981](https://github.com/vega/ts-json-schema-generator/pull/981) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
49
|
+
|
|
50
|
+
#### Authors: 8
|
|
51
|
+
|
|
52
|
+
- [@dependabot[bot]](https://github.com/dependabot[bot])
|
|
53
|
+
- [@stevenlandis-rl](https://github.com/stevenlandis-rl)
|
|
54
|
+
- Cameron Yick ([@hydrosquall](https://github.com/hydrosquall))
|
|
55
|
+
- Dominik Moritz ([@domoritz](https://github.com/domoritz))
|
|
56
|
+
- Josh Kelley ([@joshkel](https://github.com/joshkel))
|
|
57
|
+
- Mohamed Akram ([@mohd-akram](https://github.com/mohd-akram))
|
|
58
|
+
- Ruben Bridgewater ([@BridgeAR](https://github.com/BridgeAR))
|
|
59
|
+
- Skip Hendriks ([@SkipHendriks](https://github.com/SkipHendriks))
|
|
60
|
+
|
|
61
|
+
---
|
|
62
|
+
|
|
63
|
+
# v0.96.0 (Tue Oct 05 2021)
|
|
64
|
+
|
|
65
|
+
:tada: This release contains work from new contributors! :tada:
|
|
66
|
+
|
|
67
|
+
Thanks for all your work!
|
|
68
|
+
|
|
69
|
+
:heart: Remco Haszing ([@remcohaszing](https://github.com/remcohaszing))
|
|
70
|
+
|
|
71
|
+
:heart: Cameron Yick ([@hydrosquall](https://github.com/hydrosquall))
|
|
72
|
+
|
|
73
|
+
:heart: null[@stevenlandis-rl](https://github.com/stevenlandis-rl)
|
|
74
|
+
|
|
75
|
+
:heart: Josh Kelley ([@joshkel](https://github.com/joshkel))
|
|
76
|
+
|
|
77
|
+
#### 🚀 Enhancement
|
|
78
|
+
|
|
79
|
+
- feat: parse jsdoc tags using json5 [#854](https://github.com/vega/ts-json-schema-generator/pull/854) ([@remcohaszing](https://github.com/remcohaszing))
|
|
80
|
+
|
|
81
|
+
#### 🐛 Bug Fix
|
|
82
|
+
|
|
83
|
+
- fix: fix handling of falsy enums like 0 and '' [#974](https://github.com/vega/ts-json-schema-generator/pull/974) ([@joshkel](https://github.com/joshkel))
|
|
84
|
+
- fix: JSDoc parser ignores empty annotations [#973](https://github.com/vega/ts-json-schema-generator/pull/973) ([@stevenlandis-rl](https://github.com/stevenlandis-rl))
|
|
85
|
+
- fix: support constants with lambda functions [#940](https://github.com/vega/ts-json-schema-generator/pull/940) ([@stevenlandis-rl](https://github.com/stevenlandis-rl))
|
|
86
|
+
- chore: upgrade deps [#954](https://github.com/vega/ts-json-schema-generator/pull/954) ([@domoritz](https://github.com/domoritz))
|
|
87
|
+
- ci: run tests on pushes to next [#941](https://github.com/vega/ts-json-schema-generator/pull/941) ([@domoritz](https://github.com/domoritz))
|
|
88
|
+
- refactor: optional chaining [#942](https://github.com/vega/ts-json-schema-generator/pull/942) ([@domoritz](https://github.com/domoritz))
|
|
89
|
+
- docs: describe how to merge prs [#880](https://github.com/vega/ts-json-schema-generator/pull/880) ([@domoritz](https://github.com/domoritz))
|
|
90
|
+
- chore(build): fix branches-ignore syntax in auto publish Github workflow [#865](https://github.com/vega/ts-json-schema-generator/pull/865) ([@hydrosquall](https://github.com/hydrosquall))
|
|
91
|
+
|
|
92
|
+
#### 🔩 Dependency Updates
|
|
93
|
+
|
|
94
|
+
- chore(deps-dev): bump jest from 27.2.2 to 27.2.4 [#965](https://github.com/vega/ts-json-schema-generator/pull/965) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
95
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.31.2 to 4.32.0 [#966](https://github.com/vega/ts-json-schema-generator/pull/966) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
96
|
+
- chore(deps-dev): bump auto from 10.32.0 to 10.32.1 [#967](https://github.com/vega/ts-json-schema-generator/pull/967) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
97
|
+
- chore(deps-dev): bump @auto-it/first-time-contributor from 10.32.0 to 10.32.1 [#968](https://github.com/vega/ts-json-schema-generator/pull/968) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
98
|
+
- chore(deps-dev): bump @types/node from 16.10.1 to 16.10.2 [#969](https://github.com/vega/ts-json-schema-generator/pull/969) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
99
|
+
- chore(deps-dev): bump @auto-it/conventional-commits from 10.32.0 to 10.32.1 [#970](https://github.com/vega/ts-json-schema-generator/pull/970) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
100
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.31.2 to 4.32.0 [#971](https://github.com/vega/ts-json-schema-generator/pull/971) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
101
|
+
- chore(deps): bump actions/setup-node from 2.4.0 to 2.4.1 [#964](https://github.com/vega/ts-json-schema-generator/pull/964) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
102
|
+
- chore(deps-dev): bump jest from 27.2.0 to 27.2.2 [#962](https://github.com/vega/ts-json-schema-generator/pull/962) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
103
|
+
- chore(deps-dev): bump vega from 5.20.2 to 5.21.0 [#956](https://github.com/vega/ts-json-schema-generator/pull/956) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
104
|
+
- chore(deps-dev): bump jest-junit from 12.2.0 to 12.3.0 [#957](https://github.com/vega/ts-json-schema-generator/pull/957) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
105
|
+
- chore(deps-dev): bump @types/jest from 27.0.1 to 27.0.2 [#958](https://github.com/vega/ts-json-schema-generator/pull/958) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
106
|
+
- chore(deps): bump glob from 7.1.7 to 7.2.0 [#959](https://github.com/vega/ts-json-schema-generator/pull/959) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
107
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.31.1 to 4.31.2 [#960](https://github.com/vega/ts-json-schema-generator/pull/960) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
108
|
+
- chore(deps-dev): bump @types/node from 16.9.4 to 16.10.1 [#961](https://github.com/vega/ts-json-schema-generator/pull/961) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
109
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.31.1 to 4.31.2 [#963](https://github.com/vega/ts-json-schema-generator/pull/963) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
110
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.31.0 to 4.31.1 [#947](https://github.com/vega/ts-json-schema-generator/pull/947) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
111
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.31.0 to 4.31.1 [#949](https://github.com/vega/ts-json-schema-generator/pull/949) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
112
|
+
- chore(deps-dev): bump @types/node from 16.9.1 to 16.9.3 [#943](https://github.com/vega/ts-json-schema-generator/pull/943) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
113
|
+
- chore(deps-dev): bump auto from 10.31.0 to 10.32.0 [#944](https://github.com/vega/ts-json-schema-generator/pull/944) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
114
|
+
- chore(deps-dev): bump prettier from 2.4.0 to 2.4.1 [#945](https://github.com/vega/ts-json-schema-generator/pull/945) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
115
|
+
- chore(deps-dev): bump jest from 27.1.1 to 27.2.0 [#946](https://github.com/vega/ts-json-schema-generator/pull/946) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
116
|
+
- chore(deps-dev): bump @auto-it/conventional-commits from 10.31.0 to 10.32.0 [#948](https://github.com/vega/ts-json-schema-generator/pull/948) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
117
|
+
- chore(deps-dev): bump ajv from 8.6.2 to 8.6.3 [#950](https://github.com/vega/ts-json-schema-generator/pull/950) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
118
|
+
- chore(deps-dev): bump @auto-it/first-time-contributor from 10.31.0 to 10.32.0 [#951](https://github.com/vega/ts-json-schema-generator/pull/951) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
119
|
+
- chore(deps): bump codecov/codecov-action from 2.0.3 to 2.1.0 [#938](https://github.com/vega/ts-json-schema-generator/pull/938) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
120
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.30.0 to 4.31.0 [#935](https://github.com/vega/ts-json-schema-generator/pull/935) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
121
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.30.0 to 4.31.0 [#933](https://github.com/vega/ts-json-schema-generator/pull/933) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
122
|
+
- chore(deps): bump commander from 8.1.0 to 8.2.0 [#930](https://github.com/vega/ts-json-schema-generator/pull/930) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
123
|
+
- chore(deps-dev): bump prettier from 2.3.2 to 2.4.0 [#931](https://github.com/vega/ts-json-schema-generator/pull/931) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
124
|
+
- chore(deps-dev): bump @babel/preset-env from 7.15.4 to 7.15.6 [#932](https://github.com/vega/ts-json-schema-generator/pull/932) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
125
|
+
- chore(deps-dev): bump @types/node from 16.7.10 to 16.9.1 [#934](https://github.com/vega/ts-json-schema-generator/pull/934) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
126
|
+
- chore(deps-dev): bump jest from 27.1.0 to 27.1.1 [#936](https://github.com/vega/ts-json-schema-generator/pull/936) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
127
|
+
- chore(deps): bump typescript from 4.4.2 to 4.4.3 [#937](https://github.com/vega/ts-json-schema-generator/pull/937) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
128
|
+
- chore(deps-dev): bump eslint-plugin-prettier from 3.4.1 to 4.0.0 [#925](https://github.com/vega/ts-json-schema-generator/pull/925) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
129
|
+
- chore(deps-dev): bump @babel/core from 7.15.0 to 7.15.5 [#922](https://github.com/vega/ts-json-schema-generator/pull/922) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
130
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.29.3 to 4.30.0 [#926](https://github.com/vega/ts-json-schema-generator/pull/926) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
131
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.29.3 to 4.30.0 [#923](https://github.com/vega/ts-json-schema-generator/pull/923) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
132
|
+
- chore(deps-dev): bump @types/node from 16.7.5 to 16.7.10 [#924](https://github.com/vega/ts-json-schema-generator/pull/924) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
133
|
+
- chore(deps-dev): bump @babel/preset-env from 7.15.0 to 7.15.4 [#927](https://github.com/vega/ts-json-schema-generator/pull/927) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
134
|
+
- chore(deps): bump typescript from 4.3.5 to 4.4.2 [#917](https://github.com/vega/ts-json-schema-generator/pull/917) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
135
|
+
- chore(deps-dev): bump @types/node from 16.7.1 to 16.7.5 [#919](https://github.com/vega/ts-json-schema-generator/pull/919) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
136
|
+
- chore(deps-dev): bump jest from 27.0.6 to 27.1.0 [#920](https://github.com/vega/ts-json-schema-generator/pull/920) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
137
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.29.2 to 4.29.3 [#918](https://github.com/vega/ts-json-schema-generator/pull/918) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
138
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.29.2 to 4.29.3 [#921](https://github.com/vega/ts-json-schema-generator/pull/921) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
139
|
+
- chore(deps): bump codecov/codecov-action from 2.0.2 to 2.0.3 [#916](https://github.com/vega/ts-json-schema-generator/pull/916) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
140
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.29.1 to 4.29.2 [#911](https://github.com/vega/ts-json-schema-generator/pull/911) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
141
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.29.1 to 4.29.2 [#912](https://github.com/vega/ts-json-schema-generator/pull/912) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
142
|
+
- chore(deps-dev): bump @types/node from 16.6.1 to 16.7.1 [#913](https://github.com/vega/ts-json-schema-generator/pull/913) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
143
|
+
- chore(deps-dev): bump ts-node from 10.2.0 to 10.2.1 [#914](https://github.com/vega/ts-json-schema-generator/pull/914) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
144
|
+
- chore(deps-dev): bump eslint-plugin-prettier from 3.4.0 to 3.4.1 [#915](https://github.com/vega/ts-json-schema-generator/pull/915) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
145
|
+
- chore(deps-dev): bump @types/jest from 26.0.24 to 27.0.1 [#905](https://github.com/vega/ts-json-schema-generator/pull/905) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
146
|
+
- chore(deps-dev): bump ajv-formats from 2.1.0 to 2.1.1 [#902](https://github.com/vega/ts-json-schema-generator/pull/902) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
147
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.29.0 to 4.29.1 [#904](https://github.com/vega/ts-json-schema-generator/pull/904) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
148
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.29.0 to 4.29.1 [#909](https://github.com/vega/ts-json-schema-generator/pull/909) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
149
|
+
- chore(deps-dev): bump @auto-it/conventional-commits from 10.30.0 to 10.31.0 [#903](https://github.com/vega/ts-json-schema-generator/pull/903) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
150
|
+
- chore(deps-dev): bump auto from 10.30.0 to 10.31.0 [#906](https://github.com/vega/ts-json-schema-generator/pull/906) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
151
|
+
- chore(deps-dev): bump @auto-it/first-time-contributor from 10.30.0 to 10.31.0 [#907](https://github.com/vega/ts-json-schema-generator/pull/907) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
152
|
+
- chore(deps-dev): bump @types/node from 16.4.13 to 16.6.1 [#908](https://github.com/vega/ts-json-schema-generator/pull/908) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
153
|
+
- chore(deps-dev): bump ts-node from 10.1.0 to 10.2.0 [#910](https://github.com/vega/ts-json-schema-generator/pull/910) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
154
|
+
- chore(deps-dev): bump @babel/preset-env from 7.14.9 to 7.15.0 [#894](https://github.com/vega/ts-json-schema-generator/pull/894) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
155
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.28.5 to 4.29.0 [#895](https://github.com/vega/ts-json-schema-generator/pull/895) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
156
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.28.5 to 4.29.0 [#896](https://github.com/vega/ts-json-schema-generator/pull/896) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
157
|
+
- chore(deps-dev): bump @babel/preset-typescript from 7.14.5 to 7.15.0 [#898](https://github.com/vega/ts-json-schema-generator/pull/898) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
158
|
+
- chore(deps): bump @types/json-schema from 7.0.8 to 7.0.9 [#897](https://github.com/vega/ts-json-schema-generator/pull/897) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
159
|
+
- chore(deps-dev): bump @types/node from 16.4.9 to 16.4.13 [#899](https://github.com/vega/ts-json-schema-generator/pull/899) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
160
|
+
- chore(deps-dev): bump @babel/core from 7.14.8 to 7.15.0 [#900](https://github.com/vega/ts-json-schema-generator/pull/900) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
161
|
+
- chore(deps): bump actions/setup-node from 2.3.2 to 2.4.0 [#892](https://github.com/vega/ts-json-schema-generator/pull/892) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
162
|
+
- chore(deps): bump actions/setup-node from 2.3.1 to 2.3.2 [#890](https://github.com/vega/ts-json-schema-generator/pull/890) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
163
|
+
- chore(deps): bump actions/setup-node from 2.3.0 to 2.3.1 [#889](https://github.com/vega/ts-json-schema-generator/pull/889) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
164
|
+
- chore(deps-dev): bump @types/node from 16.4.2 to 16.4.9 [#882](https://github.com/vega/ts-json-schema-generator/pull/882) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
165
|
+
- chore(deps): bump commander from 8.0.0 to 8.1.0 [#883](https://github.com/vega/ts-json-schema-generator/pull/883) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
166
|
+
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 4.28.4 to 4.28.5 [#884](https://github.com/vega/ts-json-schema-generator/pull/884) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
167
|
+
- chore(deps-dev): bump eslint from 7.31.0 to 7.32.0 [#885](https://github.com/vega/ts-json-schema-generator/pull/885) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
168
|
+
- chore(deps-dev): bump @typescript-eslint/parser from 4.28.4 to 4.28.5 [#886](https://github.com/vega/ts-json-schema-generator/pull/886) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
169
|
+
- chore(deps-dev): bump @babel/preset-env from 7.14.8 to 7.14.9 [#887](https://github.com/vega/ts-json-schema-generator/pull/887) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
170
|
+
- chore(deps): bump codecov/codecov-action from 2.0.1 to 2.0.2 [#877](https://github.com/vega/ts-json-schema-generator/pull/877) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
171
|
+
- chore(deps-dev): bump @types/node from 16.4.0 to 16.4.2 [#873](https://github.com/vega/ts-json-schema-generator/pull/873) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
172
|
+
- chore(deps-dev): bump @auto-it/first-time-contributor from 10.29.3 to 10.30.0 [#874](https://github.com/vega/ts-json-schema-generator/pull/874) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
173
|
+
- chore(deps-dev): bump auto from 10.29.3 to 10.30.0 [#875](https://github.com/vega/ts-json-schema-generator/pull/875) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
174
|
+
- chore(deps-dev): bump @auto-it/conventional-commits from 10.29.3 to 10.30.0 [#876](https://github.com/vega/ts-json-schema-generator/pull/876) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
175
|
+
- chore: set up auto for versioning/release management [#856](https://github.com/vega/ts-json-schema-generator/pull/856) ([@remcohaszing](https://github.com/remcohaszing) [@hydrosquall](https://github.com/hydrosquall))
|
|
176
|
+
- chore(deps): bump codecov/codecov-action from 1.5.2 to 2.0.1 [#863](https://github.com/vega/ts-json-schema-generator/pull/863) ([@dependabot[bot]](https://github.com/dependabot[bot]))
|
|
177
|
+
|
|
178
|
+
#### Authors: 6
|
|
179
|
+
|
|
180
|
+
- [@dependabot[bot]](https://github.com/dependabot[bot])
|
|
181
|
+
- [@stevenlandis-rl](https://github.com/stevenlandis-rl)
|
|
182
|
+
- Cameron Yick ([@hydrosquall](https://github.com/hydrosquall))
|
|
183
|
+
- Dominik Moritz ([@domoritz](https://github.com/domoritz))
|
|
184
|
+
- Josh Kelley ([@joshkel](https://github.com/joshkel))
|
|
185
|
+
- Remco Haszing ([@remcohaszing](https://github.com/remcohaszing))
|
|
186
|
+
|
|
187
|
+
---
|
|
188
|
+
|
|
1
189
|
# v0.95.0 (Thu Jul 22 2021)
|
|
2
190
|
|
|
3
191
|
:tada: This release contains work from new contributors! :tada:
|
package/dist/factory/program.js
CHANGED
|
@@ -40,7 +40,7 @@ function loadTsConfigFile(configFile) {
|
|
|
40
40
|
else if (!config.config) {
|
|
41
41
|
throw new LogicError_1.LogicError(`Invalid parsed config file "${configFile}"`);
|
|
42
42
|
}
|
|
43
|
-
const parseResult = typescript_1.default.parseJsonConfigFileContent(config.config, typescript_1.default.sys, path.dirname(configFile), {}, configFile);
|
|
43
|
+
const parseResult = typescript_1.default.parseJsonConfigFileContent(config.config, typescript_1.default.sys, path.resolve(path.dirname(configFile)), {}, configFile);
|
|
44
44
|
parseResult.options.noEmit = true;
|
|
45
45
|
delete parseResult.options.out;
|
|
46
46
|
delete parseResult.options.outDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../factory/program.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,2CAA6B;AAC7B,4DAA4B;AAG5B,kEAA+D;AAC/D,wDAAqD;AACrD,oEAAiE;AACjE,kEAA+D;AAE/D,SAAS,gBAAgB,CAAC,UAAkB;IACxC,MAAM,GAAG,GAAG,oBAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACxC,IAAI,GAAG,EAAE;QACL,MAAM,MAAM,GAAG,oBAAE,CAAC,yBAAyB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAE7D,IAAI,MAAM,CAAC,KAAK,EAAE;YACd,MAAM,IAAI,iCAAe,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvB,MAAM,IAAI,uBAAU,CAAC,+BAA+B,UAAU,GAAG,CAAC,CAAC;SACtE;QAED,MAAM,WAAW,GAAG,oBAAE,CAAC,0BAA0B,CAC7C,MAAM,CAAC,MAAM,EACb,oBAAE,CAAC,GAAG,EACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../factory/program.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-json-schema-generator",
|
|
3
|
-
"version": "0.97.0
|
|
3
|
+
"version": "0.97.0",
|
|
4
4
|
"description": "Generate JSON schema from your Typescript sources",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -46,9 +46,8 @@
|
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@types/json-schema": "^7.0.9",
|
|
48
48
|
"commander": "^8.2.0",
|
|
49
|
-
"fast-json-stable-stringify": "^2.1.0",
|
|
50
49
|
"glob": "^7.2.0",
|
|
51
|
-
"
|
|
50
|
+
"safe-stable-stringify": "^2.2.0",
|
|
52
51
|
"json5": "^2.2.0",
|
|
53
52
|
"typescript": "~4.4.3"
|
|
54
53
|
},
|
|
@@ -60,7 +59,6 @@
|
|
|
60
59
|
"@babel/preset-typescript": "^7.15.0",
|
|
61
60
|
"@types/glob": "^7.1.4",
|
|
62
61
|
"@types/jest": "^27.0.2",
|
|
63
|
-
"@types/json-stable-stringify": "^1.0.33",
|
|
64
62
|
"@types/node": "^16.10.3",
|
|
65
63
|
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
|
66
64
|
"@typescript-eslint/parser": "^4.33.0",
|
|
@@ -9,6 +9,7 @@ const typescript_1 = __importDefault(require("typescript"));
|
|
|
9
9
|
const NodeParser_1 = require("../NodeParser");
|
|
10
10
|
const UnionType_1 = require("../Type/UnionType");
|
|
11
11
|
const LiteralType_1 = require("../Type/LiteralType");
|
|
12
|
+
const SymbolType_1 = require("../Type/SymbolType");
|
|
12
13
|
class CallExpressionParser {
|
|
13
14
|
constructor(typeChecker, childNodeParser) {
|
|
14
15
|
this.typeChecker = typeChecker;
|
|
@@ -25,6 +26,9 @@ class CallExpressionParser {
|
|
|
25
26
|
new UnionType_1.UnionType(type.typeArguments[0].types.map((t) => new LiteralType_1.LiteralType(t.value))),
|
|
26
27
|
]);
|
|
27
28
|
}
|
|
29
|
+
if (type.flags === typescript_1.default.TypeFlags.UniqueESSymbol) {
|
|
30
|
+
return new SymbolType_1.SymbolType();
|
|
31
|
+
}
|
|
28
32
|
const symbol = type.symbol || type.aliasSymbol;
|
|
29
33
|
const decl = symbol.valueDeclaration || symbol.declarations[0];
|
|
30
34
|
const subContext = this.createSubContext(node, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CallExpressionParser.js","sourceRoot":"","sources":["../../../src/NodeParser/CallExpressionParser.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA8C;AAC9C,4DAA4B;AAC5B,8CAAoD;AAGpD,iDAA8C;AAC9C,qDAAkD;
|
|
1
|
+
{"version":3,"file":"CallExpressionParser.js","sourceRoot":"","sources":["../../../src/NodeParser/CallExpressionParser.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA8C;AAC9C,4DAA4B;AAC5B,8CAAoD;AAGpD,iDAA8C;AAC9C,qDAAkD;AAClD,mDAAgD;AAEhD,MAAa,oBAAoB;IAC7B,YAA2B,WAA2B,EAAU,eAA2B;QAAhE,gBAAW,GAAX,WAAW,CAAgB;QAAU,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAExF,YAAY,CAAC,IAAuB;QACvC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC;IACtD,CAAC;IACM,UAAU,CAAC,IAAuB,EAAE,OAAgB;;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAGtD,IAAI,MAAC,IAAY,0CAAE,aAAa,EAAE;YAC9B,OAAO,IAAI,qBAAS,CAAC;gBACjB,IAAI,qBAAS,CAAE,IAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,yBAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aAChG,CAAC,CAAC;SACN;QAGD,IAAI,IAAI,CAAC,KAAK,KAAK,oBAAE,CAAC,SAAS,CAAC,cAAc,EAAE;YAC5C,OAAO,IAAI,uBAAU,EAAE,CAAC;SAC3B;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,YAAa,CAAC,CAAC,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAE,CAAC;IAC9D,CAAC;IAEO,gBAAgB,CAAC,IAAuB,EAAE,aAAsB;QACpE,MAAM,UAAU,GAAG,IAAI,oBAAO,CAAC,IAAI,CAAC,CAAC;QAErC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YACjE,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AApCD,oDAoCC"}
|
package/dist/src/NodeParser.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Context = void 0;
|
|
7
|
-
const
|
|
7
|
+
const safe_stable_stringify_1 = __importDefault(require("safe-stable-stringify"));
|
|
8
8
|
const nodeKey_1 = require("./Utils/nodeKey");
|
|
9
9
|
class Context {
|
|
10
10
|
constructor(reference) {
|
|
@@ -26,7 +26,7 @@ class Context {
|
|
|
26
26
|
}
|
|
27
27
|
getCacheKey() {
|
|
28
28
|
if (this.cacheKey == null) {
|
|
29
|
-
this.cacheKey = (0,
|
|
29
|
+
this.cacheKey = (0, safe_stable_stringify_1.default)([
|
|
30
30
|
this.reference ? (0, nodeKey_1.getKey)(this.reference, this) : "",
|
|
31
31
|
this.arguments.map((argument) => argument === null || argument === void 0 ? void 0 : argument.getId()),
|
|
32
32
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeParser.js","sourceRoot":"","sources":["../../src/NodeParser.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"NodeParser.js","sourceRoot":"","sources":["../../src/NodeParser.ts"],"names":[],"mappings":";;;;;;AAAA,kFAA8C;AAI9C,6CAAyC;AAEzC,MAAa,OAAO;IAOhB,YAAmB,SAAmB;QAN9B,aAAQ,GAAkB,IAAI,CAAC;QAC/B,cAAS,GAA6B,EAAE,CAAC;QACzC,eAAU,GAAa,EAAE,CAAC;QAE1B,oBAAe,GAAG,IAAI,GAAG,EAAgC,CAAC;QAG9D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,YAAY,CAAC,YAAkC;QAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAEM,aAAa,CAAC,aAAqB;QACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;IAEM,UAAU,CAAC,aAAqB,EAAE,YAAkC;QACvE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC1D,CAAC;IAEM,WAAW;QACd,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;YACvB,IAAI,CAAC,QAAQ,GAAG,IAAA,+BAAS,EAAC;gBACtB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gBAAM,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBAClD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE,CAAC;aACtD,CAAC,CAAC;SACN;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,WAAW,CAAC,aAAqB;QACpC,MAAM,KAAK,GAAW,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC7D,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACrC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBACzC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC;aACnD;SACJ;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAEM,aAAa;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;CACJ;AAvDD,0BAuDC"}
|
|
@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.intersectionOfArrays = void 0;
|
|
7
|
-
const
|
|
7
|
+
const safe_stable_stringify_1 = __importDefault(require("safe-stable-stringify"));
|
|
8
8
|
function intersectionOfArrays(a, b) {
|
|
9
9
|
const output = [];
|
|
10
|
-
const inA = new Set(a.map((item) => (0,
|
|
10
|
+
const inA = new Set(a.map((item) => (0, safe_stable_stringify_1.default)(item)));
|
|
11
11
|
for (const value of b) {
|
|
12
|
-
if (inA.has((0,
|
|
12
|
+
if (inA.has((0, safe_stable_stringify_1.default)(value))) {
|
|
13
13
|
output.push(value);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intersectionOfArrays.js","sourceRoot":"","sources":["../../../src/Utils/intersectionOfArrays.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"intersectionOfArrays.js","sourceRoot":"","sources":["../../../src/Utils/intersectionOfArrays.ts"],"names":[],"mappings":";;;;;;AAAA,kFAA8C;AAE9C,SAAgB,oBAAoB,CAAI,CAAM,EAAE,CAAM;IAClD,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,GAAG,GAAgB,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,EAAE,CAAC,IAAA,+BAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtE,KAAK,MAAM,KAAK,IAAI,CAAC,EAAE;QACnB,IAAI,GAAG,CAAC,GAAG,CAAC,IAAA,+BAAS,EAAC,KAAK,CAAC,CAAC,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AATD,oDASC"}
|
|
@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getKey = exports.hash = void 0;
|
|
7
|
-
const
|
|
7
|
+
const safe_stable_stringify_1 = __importDefault(require("safe-stable-stringify"));
|
|
8
8
|
function hash(a) {
|
|
9
9
|
if (typeof a === "number") {
|
|
10
10
|
return a;
|
|
11
11
|
}
|
|
12
|
-
const str = typeof a === "string" ? a : (0,
|
|
12
|
+
const str = typeof a === "string" ? a : (0, safe_stable_stringify_1.default)(a);
|
|
13
13
|
if (str.length < 20) {
|
|
14
14
|
return str;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeKey.js","sourceRoot":"","sources":["../../../src/Utils/nodeKey.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"nodeKey.js","sourceRoot":"","sources":["../../../src/Utils/nodeKey.ts"],"names":[],"mappings":";;;;;;AAAA,kFAA8C;AAI9C,SAAgB,IAAI,CAAC,CAAU;IAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QACvB,OAAO,CAAC,CAAC;KACZ;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,+BAAS,EAAC,CAAC,CAAC,CAAC;IAGrD,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE;QACjB,OAAO,GAAG,CAAC;KACd;IAGD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACxB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACb;IAGD,IAAI,CAAC,GAAG,CAAC,EAAE;QACP,OAAO,CAAC,CAAC,CAAC;KACb;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AA1BD,oBA0BC;AAED,SAAgB,MAAM,CAAC,IAAU,EAAE,OAAgB;IAC/C,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,OAAO,IAAI,EAAE;QACT,MAAM,IAAI,GAAG,IAAI;aACZ,aAAa,EAAE;aACf,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;aACzC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACzB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;KACtB;IACD,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,EAAE,CAAC,CAAC;IAEtE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACvE,CAAC;AAhBD,wBAgBC"}
|
|
@@ -23,13 +23,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
const commander_1 = require("commander");
|
|
26
|
-
const
|
|
27
|
-
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
26
|
+
const safe_stable_stringify_1 = __importDefault(require("safe-stable-stringify"));
|
|
28
27
|
const generator_1 = require("./factory/generator");
|
|
29
28
|
const Config_1 = require("./src/Config");
|
|
30
29
|
const BaseError_1 = require("./src/Error/BaseError");
|
|
31
30
|
const formatError_1 = require("./src/Utils/formatError");
|
|
32
31
|
const pkg = __importStar(require("./package.json"));
|
|
32
|
+
const path_1 = require("path");
|
|
33
|
+
const fs_1 = require("fs");
|
|
33
34
|
const args = new commander_1.Command()
|
|
34
35
|
.option("-p, --path <path>", "Source file path")
|
|
35
36
|
.option("-t, --type <name>", "Type name")
|
|
@@ -68,12 +69,11 @@ const config = {
|
|
|
68
69
|
};
|
|
69
70
|
try {
|
|
70
71
|
const schema = (0, generator_1.createGenerator)(config).createSchema(args.type);
|
|
71
|
-
const schemaString = config.sortProps ? (0,
|
|
72
|
+
const schemaString = config.sortProps ? (0, safe_stable_stringify_1.default)(schema, null, 2) : JSON.stringify(schema, null, 2);
|
|
72
73
|
if (args.out) {
|
|
73
|
-
(0,
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
});
|
|
74
|
+
const outPath = (0, path_1.dirname)(args.out);
|
|
75
|
+
(0, fs_1.mkdirSync)(outPath, { recursive: true });
|
|
76
|
+
(0, fs_1.writeFileSync)(args.out, schemaString);
|
|
77
77
|
}
|
|
78
78
|
else {
|
|
79
79
|
process.stdout.write(`${schemaString}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-json-schema-generator.js","sourceRoot":"","sources":["../ts-json-schema-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"ts-json-schema-generator.js","sourceRoot":"","sources":["../ts-json-schema-generator.ts"],"names":[],"mappings":"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"}
|
package/factory/program.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-json-schema-generator",
|
|
3
|
-
"version": "0.97.0
|
|
3
|
+
"version": "0.97.0",
|
|
4
4
|
"description": "Generate JSON schema from your Typescript sources",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -46,9 +46,8 @@
|
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@types/json-schema": "^7.0.9",
|
|
48
48
|
"commander": "^8.2.0",
|
|
49
|
-
"fast-json-stable-stringify": "^2.1.0",
|
|
50
49
|
"glob": "^7.2.0",
|
|
51
|
-
"
|
|
50
|
+
"safe-stable-stringify": "^2.2.0",
|
|
52
51
|
"json5": "^2.2.0",
|
|
53
52
|
"typescript": "~4.4.3"
|
|
54
53
|
},
|
|
@@ -60,7 +59,6 @@
|
|
|
60
59
|
"@babel/preset-typescript": "^7.15.0",
|
|
61
60
|
"@types/glob": "^7.1.4",
|
|
62
61
|
"@types/jest": "^27.0.2",
|
|
63
|
-
"@types/json-stable-stringify": "^1.0.33",
|
|
64
62
|
"@types/node": "^16.10.3",
|
|
65
63
|
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
|
66
64
|
"@typescript-eslint/parser": "^4.33.0",
|
|
@@ -5,6 +5,7 @@ import { SubNodeParser } from "../SubNodeParser";
|
|
|
5
5
|
import { BaseType } from "../Type/BaseType";
|
|
6
6
|
import { UnionType } from "../Type/UnionType";
|
|
7
7
|
import { LiteralType } from "../Type/LiteralType";
|
|
8
|
+
import { SymbolType } from "../Type/SymbolType";
|
|
8
9
|
|
|
9
10
|
export class CallExpressionParser implements SubNodeParser {
|
|
10
11
|
public constructor(private typeChecker: ts.TypeChecker, private childNodeParser: NodeParser) {}
|
|
@@ -22,6 +23,11 @@ export class CallExpressionParser implements SubNodeParser {
|
|
|
22
23
|
]);
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
// A call expression like Symbol("entity") that resulted in a `unique symbol`
|
|
27
|
+
if (type.flags === ts.TypeFlags.UniqueESSymbol) {
|
|
28
|
+
return new SymbolType();
|
|
29
|
+
}
|
|
30
|
+
|
|
25
31
|
const symbol = type.symbol || type.aliasSymbol;
|
|
26
32
|
const decl = symbol.valueDeclaration || symbol.declarations![0];
|
|
27
33
|
const subContext = this.createSubContext(node, context);
|
package/src/NodeParser.ts
CHANGED
package/src/Utils/nodeKey.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Command, Option } from "commander";
|
|
2
|
-
import
|
|
3
|
-
import stringify from "json-stable-stringify";
|
|
2
|
+
import stringify from "safe-stable-stringify";
|
|
4
3
|
import { createGenerator } from "./factory/generator";
|
|
5
4
|
import { Config, DEFAULT_CONFIG } from "./src/Config";
|
|
6
5
|
import { BaseError } from "./src/Error/BaseError";
|
|
7
6
|
import { formatError } from "./src/Utils/formatError";
|
|
8
7
|
import * as pkg from "./package.json";
|
|
8
|
+
import { dirname } from "path";
|
|
9
|
+
import { mkdirSync, writeFileSync } from "fs";
|
|
9
10
|
|
|
10
11
|
const args = new Command()
|
|
11
12
|
.option("-p, --path <path>", "Source file path")
|
|
@@ -60,13 +61,13 @@ const config: Config = {
|
|
|
60
61
|
|
|
61
62
|
try {
|
|
62
63
|
const schema = createGenerator(config).createSchema(args.type);
|
|
63
|
-
const schemaString = config.sortProps ? stringify(schema,
|
|
64
|
+
const schemaString = config.sortProps ? stringify(schema, null, 2) : JSON.stringify(schema, null, 2);
|
|
64
65
|
|
|
65
66
|
if (args.out) {
|
|
66
67
|
// write to file
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
const outPath = dirname(args.out);
|
|
69
|
+
mkdirSync(outPath, { recursive: true });
|
|
70
|
+
writeFileSync(args.out, schemaString);
|
|
70
71
|
} else {
|
|
71
72
|
// write to stdout
|
|
72
73
|
process.stdout.write(`${schemaString}\n`);
|