Skip to content

Commit ec2f7d6

Browse files
HiiiiDHiiiiD
authored
Merge branch 'drwpow:main' into fix-path-generation
2 parents 19bc66a + f421112 commit ec2f7d6

19 files changed

+67795
-57700
lines changed

‎.all-contributorsrc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,49 @@
587587
"bug",
588588
"test"
589589
]
590+
},
591+
{
592+
"login": "imagoiq",
593+
"name": "Loïc Fürhoff",
594+
"avatar_url": "https://avatars.githubusercontent.com/u/12294151?v=4",
595+
"profile": "https://github.com/imagoiq",
596+
"contributions": [
597+
"code",
598+
"test",
599+
"bug"
600+
]
601+
},
602+
{
603+
"login": "BTMPL",
604+
"name": "Bartosz Szczeciński",
605+
"avatar_url": "https://avatars.githubusercontent.com/u/247153?v=4",
606+
"profile": "https://github.com/BTMPL",
607+
"contributions": [
608+
"code",
609+
"bug",
610+
"test"
611+
]
612+
},
613+
{
614+
"login": "HiiiiD",
615+
"name": "Marco Salomone",
616+
"avatar_url": "https://avatars.githubusercontent.com/u/61231210?v=4",
617+
"profile": "https://github.com/HiiiiD",
618+
"contributions": [
619+
"code",
620+
"test"
621+
]
622+
},
623+
{
624+
"login": "yacinehmito",
625+
"name": "Yacine Hmito",
626+
"avatar_url": "https://avatars.githubusercontent.com/u/6893840?v=4",
627+
"profile": "https://github.com/yacinehmito",
628+
"contributions": [
629+
"code",
630+
"test",
631+
"bug"
632+
]
590633
}
591634
],
592635
"contributorsPerLine": 7,

‎README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![codecov](https://codecov.io/gh/drwpow/openapi-typescript/branch/main/graph/badge.svg)](https://codecov.io/gh/drwpow/openapi-typescript)
44

55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-56-orange.svg?style=flat-square)](#contributors-)
6+
[![All Contributors](https://img.shields.io/badge/all_contributors-60-orange.svg?style=flat-square)](#contributors-)
77
<!-- ALL-CONTRIBUTORS-BADGE:END -->
88

99
# 📘️ openapi-typescript
@@ -387,6 +387,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
387387
<td align="center"><a href="http://jeremyliberman.com/"><img src="https://avatars.githubusercontent.com/u/2754163?v=4?s=100" width="100px;" alt="Jeremy Liberman"/><br /><sub><b>Jeremy Liberman</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=MrLeebo" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=MrLeebo" title="Tests">⚠️</a></td>
388388
<td align="center"><a href="http://axelhzf.com"><img src="https://avatars.githubusercontent.com/u/175627?v=4?s=100" width="100px;" alt="Axel Hernández Ferrera"/><br /><sub><b>Axel Hernández Ferrera</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=axelhzf" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/issues?q=author%3Aaxelhzf" title="Bug reports">🐛</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=axelhzf" title="Tests">⚠️</a></td>
389389
</tr>
390+
<tr>
391+
<td align="center"><a href="https://github.com/imagoiq"><img src="https://avatars.githubusercontent.com/u/12294151?v=4?s=100" width="100px;" alt="Loïc Fürhoff"/><br /><sub><b>Loïc Fürhoff</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=imagoiq" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=imagoiq" title="Tests">⚠️</a> <a href="https://github.com/drwpow/openapi-typescript/issues?q=author%3Aimagoiq" title="Bug reports">🐛</a></td>
392+
<td align="center"><a href="https://github.com/BTMPL"><img src="https://avatars.githubusercontent.com/u/247153?v=4?s=100" width="100px;" alt="Bartosz Szczeciński"/><br /><sub><b>Bartosz Szczeciński</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=BTMPL" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/issues?q=author%3ABTMPL" title="Bug reports">🐛</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=BTMPL" title="Tests">⚠️</a></td>
393+
<td align="center"><a href="https://github.com/HiiiiD"><img src="https://avatars.githubusercontent.com/u/61231210?v=4?s=100" width="100px;" alt="Marco Salomone"/><br /><sub><b>Marco Salomone</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=HiiiiD" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=HiiiiD" title="Tests">⚠️</a></td>
394+
<td align="center"><a href="https://github.com/yacinehmito"><img src="https://avatars.githubusercontent.com/u/6893840?v=4?s=100" width="100px;" alt="Yacine Hmito"/><br /><sub><b>Yacine Hmito</b></sub></a><br /><a href="https://github.com/drwpow/openapi-typescript/commits?author=yacinehmito" title="Code">💻</a> <a href="https://github.com/drwpow/openapi-typescript/commits?author=yacinehmito" title="Tests">⚠️</a> <a href="https://github.com/drwpow/openapi-typescript/issues?q=author%3Ayacinehmito" title="Bug reports">🐛</a></td>
395+
</tr>
390396
</tbody>
391397
</table>
392398

‎bin/cli.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env node
22

33
import fs from "node:fs";
4+
import path from "path";
45
import { URL } from "node:url";
56
import glob from "fast-glob";
67
import parser from "yargs-parser";
@@ -181,8 +182,12 @@ async function main() {
181182
await Promise.all(
182183
inputSpecPaths.map(async (specPath) => {
183184
if (flags.output !== "." && output === OUTPUT_FILE) {
184-
if (isGlob) outputDir = new URL(specPath, outputDir);
185-
fs.mkdirSync(outputDir, { recursive: true }); // recursively make parent dirs
185+
if (isGlob) {
186+
fs.mkdirSync(new URL(path.dirname(specPath), outputDir), { recursive: true }); // recursively make parent dirs
187+
}
188+
else {
189+
fs.mkdirSync(outputDir, { recursive: true }); // recursively make parent dirs
190+
}
186191
}
187192
await generateSchema(specPath);
188193
})

‎examples/digital-ocean-api.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,8 @@ export interface paths {
640640
};
641641
}
642642

643+
export type webhooks = Record<string, never>;
644+
643645
export interface components {
644646
schemas: never;
645647
responses: never;
@@ -654,6 +656,7 @@ export interface external {
654656
"description.yml": {
655657

656658
paths: Record<string, never>;
659+
webhooks: Record<string, never>;
657660
components: Record<string, never>;
658661
}
659662
"resources/1-clicks/models/oneClicks_create.yml": {

0 commit comments

Comments
 (0)