Skip to content

Commit 19f19db

Browse files
fix: Discriminator flags were missing experimental prefix (#22)
1 parent 19bdd74 commit 19f19db

4 files changed

Lines changed: 108 additions & 19 deletions

File tree

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@denosaurs/typefetch",
3-
"version": "0.0.33",
3+
"version": "0.0.34",
44
"exports": {
55
".": "./main.ts"
66
},

flake.lock

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
4+
flake-utils.url = "github:numtide/flake-utils";
5+
};
6+
7+
outputs =
8+
{
9+
self,
10+
nixpkgs,
11+
flake-utils,
12+
}:
13+
flake-utils.lib.eachDefaultSystem (
14+
system:
15+
let
16+
pkgs = import nixpkgs { inherit system; };
17+
in
18+
{
19+
devShells = with pkgs; {
20+
default = mkShell {
21+
buildInputs = [
22+
deno
23+
];
24+
};
25+
};
26+
}
27+
);
28+
}

main.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ const parseOptions = {
2727
"experimental-urlsearchparams",
2828
"experimental-require-discriminator",
2929
],
30-
alias: { "output": "o", "help": "h", "version": "V" },
30+
alias: { output: "o", help: "h", version: "V" },
3131
default: {
32-
"output": "./typefetch.d.ts",
33-
"import": "__npm" in globalThis
32+
output: "./typefetch.d.ts",
33+
import: "__npm" in globalThis
3434
? manifest.name
3535
: "https://raw.githubusercontent.com/denosaurs/typefetch/main",
3636
"include-server-urls": true,
@@ -57,19 +57,19 @@ if (args.help) {
5757
// deno-fmt-ignore
5858
console.log(
5959
`Usage: typefetch [OPTIONS] <PATH>\n\n` +
60-
`Options:\n` +
61-
` -h, --help Print this help message\n` +
62-
` -V, --version Print the version of TypeFetch\n` +
63-
` -o, --output <PATH> Output file path (default: ${parseOptions.default["output"]})\n` +
64-
` --config <PATH> File path to the tsconfig.json file\n` +
65-
` --import <PATH> Import path for TypeFetch (default: ${parseOptions.default["import"]})\n` +
66-
` --base-urls <URLS> A comma separated list of custom base urls for paths to start with\n` +
67-
` --include-server-urls Include server URLs from the schema in the generated paths (default: ${parseOptions.default["include-server-urls"]})\n` +
68-
` --include-absolute-url Include absolute URLs in the generated paths (default: ${parseOptions.default["include-absolute-url"]})\n` +
69-
` --include-relative-url Include relative URLs in the generated paths (default: ${parseOptions.default["include-relative-url"]})\n` +
70-
` --experimental-urlsearchparams Enable the experimental fully typed URLSearchParamsString type (default: ${parseOptions.default["experimental-urlsearchparams"]})\n` +
71-
` --experimental-discriminator Allows you to specify a discriminator generic argument to fetch (default: ${parseOptions.default["experimental-discriminator"]})\n` +
72-
` --experimental-require-discriminator Makes the use of a discriminator generic argument required (default: ${parseOptions.default["experimental-require-discriminator"]})\n`,
60+
`Options:\n` +
61+
` -h, --help Print this help message\n` +
62+
` -V, --version Print the version of TypeFetch\n` +
63+
` -o, --output <PATH> Output file path (default: ${parseOptions.default["output"]})\n` +
64+
` --config <PATH> File path to the tsconfig.json file\n` +
65+
` --import <PATH> Import path for TypeFetch (default: ${parseOptions.default["import"]})\n` +
66+
` --base-urls <URLS> A comma separated list of custom base urls for paths to start with\n` +
67+
` --include-server-urls Include server URLs from the schema in the generated paths (default: ${parseOptions.default["include-server-urls"]})\n` +
68+
` --include-absolute-url Include absolute URLs in the generated paths (default: ${parseOptions.default["include-absolute-url"]})\n` +
69+
` --include-relative-url Include relative URLs in the generated paths (default: ${parseOptions.default["include-relative-url"]})\n` +
70+
` --experimental-urlsearchparams Enable the experimental fully typed URLSearchParamsString type (default: ${parseOptions.default["experimental-urlsearchparams"]})\n` +
71+
` --experimental-discriminator Allows you to specify a discriminator generic argument to fetch (default: ${parseOptions.default["experimental-discriminator"]})\n` +
72+
` --experimental-require-discriminator Makes the use of a discriminator generic argument required (default: ${parseOptions.default["experimental-require-discriminator"]})\n`,
7373
);
7474
Deno.exit(0);
7575
}
@@ -117,8 +117,8 @@ const options = {
117117
includeServerUrls: args["include-server-urls"],
118118
includeRelativeUrl: args["include-relative-url"],
119119
experimentalURLSearchParams: args["experimental-urlsearchparams"],
120-
discriminator: args["experimental-discriminator"],
121-
requireDiscriminator: args["experimental-require-discriminator"],
120+
experimentalDiscriminator: args["experimental-discriminator"],
121+
experimentalRequireDiscriminator: args["experimental-require-discriminator"],
122122
};
123123

124124
const project = new Project({ tsConfigFilePath: args.config });

0 commit comments

Comments
 (0)