diff --git a/deno.json b/deno.json index ad77a3d..9a8b1ff 100644 --- a/deno.json +++ b/deno.json @@ -1,6 +1,6 @@ { "name": "@denosaurs/typefetch", - "version": "0.0.33", + "version": "0.0.34", "exports": { ".": "./main.ts" }, diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..90c9144 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..d2374aa --- /dev/null +++ b/flake.nix @@ -0,0 +1,28 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = + { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { inherit system; }; + in + { + devShells = with pkgs; { + default = mkShell { + buildInputs = [ + deno + ]; + }; + }; + } + ); +} diff --git a/main.ts b/main.ts index 43d8420..28ebaf4 100644 --- a/main.ts +++ b/main.ts @@ -27,10 +27,10 @@ const parseOptions = { "experimental-urlsearchparams", "experimental-require-discriminator", ], - alias: { "output": "o", "help": "h", "version": "V" }, + alias: { output: "o", help: "h", version: "V" }, default: { - "output": "./typefetch.d.ts", - "import": "__npm" in globalThis + output: "./typefetch.d.ts", + import: "__npm" in globalThis ? manifest.name : "https://raw.githubusercontent.com/denosaurs/typefetch/main", "include-server-urls": true, @@ -57,19 +57,19 @@ if (args.help) { // deno-fmt-ignore console.log( `Usage: typefetch [OPTIONS] \n\n` + - `Options:\n` + - ` -h, --help Print this help message\n` + - ` -V, --version Print the version of TypeFetch\n` + - ` -o, --output Output file path (default: ${parseOptions.default["output"]})\n` + - ` --config File path to the tsconfig.json file\n` + - ` --import Import path for TypeFetch (default: ${parseOptions.default["import"]})\n` + - ` --base-urls A comma separated list of custom base urls for paths to start with\n` + - ` --include-server-urls Include server URLs from the schema in the generated paths (default: ${parseOptions.default["include-server-urls"]})\n` + - ` --include-absolute-url Include absolute URLs in the generated paths (default: ${parseOptions.default["include-absolute-url"]})\n` + - ` --include-relative-url Include relative URLs in the generated paths (default: ${parseOptions.default["include-relative-url"]})\n` + - ` --experimental-urlsearchparams Enable the experimental fully typed URLSearchParamsString type (default: ${parseOptions.default["experimental-urlsearchparams"]})\n` + - ` --experimental-discriminator Allows you to specify a discriminator generic argument to fetch (default: ${parseOptions.default["experimental-discriminator"]})\n` + - ` --experimental-require-discriminator Makes the use of a discriminator generic argument required (default: ${parseOptions.default["experimental-require-discriminator"]})\n`, + `Options:\n` + + ` -h, --help Print this help message\n` + + ` -V, --version Print the version of TypeFetch\n` + + ` -o, --output Output file path (default: ${parseOptions.default["output"]})\n` + + ` --config File path to the tsconfig.json file\n` + + ` --import Import path for TypeFetch (default: ${parseOptions.default["import"]})\n` + + ` --base-urls A comma separated list of custom base urls for paths to start with\n` + + ` --include-server-urls Include server URLs from the schema in the generated paths (default: ${parseOptions.default["include-server-urls"]})\n` + + ` --include-absolute-url Include absolute URLs in the generated paths (default: ${parseOptions.default["include-absolute-url"]})\n` + + ` --include-relative-url Include relative URLs in the generated paths (default: ${parseOptions.default["include-relative-url"]})\n` + + ` --experimental-urlsearchparams Enable the experimental fully typed URLSearchParamsString type (default: ${parseOptions.default["experimental-urlsearchparams"]})\n` + + ` --experimental-discriminator Allows you to specify a discriminator generic argument to fetch (default: ${parseOptions.default["experimental-discriminator"]})\n` + + ` --experimental-require-discriminator Makes the use of a discriminator generic argument required (default: ${parseOptions.default["experimental-require-discriminator"]})\n`, ); Deno.exit(0); } @@ -117,8 +117,8 @@ const options = { includeServerUrls: args["include-server-urls"], includeRelativeUrl: args["include-relative-url"], experimentalURLSearchParams: args["experimental-urlsearchparams"], - discriminator: args["experimental-discriminator"], - requireDiscriminator: args["experimental-require-discriminator"], + experimentalDiscriminator: args["experimental-discriminator"], + experimentalRequireDiscriminator: args["experimental-require-discriminator"], }; const project = new Project({ tsConfigFilePath: args.config });