Skip to content

Commit

Permalink
fix: param bug where empty string is infered
Browse files Browse the repository at this point in the history
  • Loading branch information
Bekacru committed Sep 5, 2024
1 parent 250630e commit 5142c45
Show file tree
Hide file tree
Showing 11 changed files with 295 additions and 5 deletions.
175 changes: 175 additions & 0 deletions dev/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore

# Logs

logs
_.log
npm-debug.log_
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Caches

.cache

# Diagnostic reports (https://nodejs.org/api/report.html)

report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json

# Runtime data

pids
_.pid
_.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover

lib-cov

# Coverage directory used by tools like istanbul

coverage
*.lcov

# nyc test coverage

.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)

.grunt

# Bower dependency directory (https://bower.io/)

bower_components

# node-waf configuration

.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)

build/Release

# Dependency directories

node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)

web_modules/

# TypeScript cache

*.tsbuildinfo

# Optional npm cache directory

.npm

# Optional eslint cache

.eslintcache

# Optional stylelint cache

.stylelintcache

# Microbundle cache

.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history

.node_repl_history

# Output of 'npm pack'

*.tgz

# Yarn Integrity file

.yarn-integrity

# dotenv environment variable files

.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)

.parcel-cache

# Next.js build output

.next
out

# Nuxt.js build / generate output

.nuxt
dist

# Gatsby files

# Comment in the public line in if your project uses Gatsby and not Next.js

# https://nextjs.org/blog/next-9-1#public-directory-support

# public

# vuepress build output

.vuepress/dist

# vuepress v2.x temp and cache directory

.temp

# Docusaurus cache and generated files

.docusaurus

# Serverless directories

.serverless/

# FuseBox cache

.fusebox/

# DynamoDB Local files

.dynamodb/

# TernJS port file

.tern-port

# Stores VSCode versions used for testing VSCode extensions

.vscode-test

# yarn v2

.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

# IntelliJ based IDEs
.idea

# Finder (MacOS) folder config
.DS_Store
15 changes: 15 additions & 0 deletions dev/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# dev

To install dependencies:

```bash
bun install
```

To run:

```bash
bun run index.ts
```

This project was created using `bun init` in bun v1.1.17. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.
23 changes: 23 additions & 0 deletions dev/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { betterFetch, createFetch, createSchema } from "@better-fetch/fetch";
import { z } from "zod";

const $fetch = createFetch({
schema: createSchema({
"@patch/user": {
input: z.object({
id: z.string(),
}),
},
}),
baseURL: "http://localhost:3000",
onRequest(context) {
console.log("onRequest", JSON.parse(context.body));
},
});

const f = $fetch("https://jsonplaceholder.typicode.com/todos/:id", {
method: "GET",
params: {
id: "1",
},
});
19 changes: 19 additions & 0 deletions dev/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "dev",
"module": "index.ts",
"type": "module",
"scripts": {
"client": "bun run index.ts",
"serve": "bun run server.ts"
},
"devDependencies": {
"@types/bun": "latest"
},
"peerDependencies": {
"typescript": "^5.0.0"
},
"dependencies": {
"@better-fetch/fetch": "workspace:*",
"zod": "^3.23.8"
}
}
10 changes: 10 additions & 0 deletions dev/server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Bun.serve({
fetch(request, server) {
return new Response("Hello World!", {
status: 200,
headers: {
"Content-Type": "text/plain",
},
});
},
});
27 changes: 27 additions & 0 deletions dev/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"compilerOptions": {
// Enable latest features
"lib": ["ESNext", "DOM"],
"target": "ESNext",
"module": "ESNext",
"moduleDetection": "force",
"jsx": "react-jsx",
"allowJs": true,

// Bundler mode
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"noEmit": true,

// Best practices
"strict": true,
"skipLibCheck": true,
"noFallthroughCasesInSwitch": true,

// Some stricter flags (disabled by default)
"noUnusedLocals": false,
"noUnusedParameters": false,
"noPropertyAccessFromIndexSignature": false
}
}
1 change: 1 addition & 0 deletions doc/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { rehypeCodeDefaultOptions } from "fumadocs-core/mdx-plugins";
import { remarkInstall } from "fumadocs-docgen";
import createMDX from "fumadocs-mdx/config";
import { transformerTwoslash } from "fumadocs-twoslash";

const withMDX = createMDX({
mdxOptions: {
rehypeCodeOptions: {
Expand Down
4 changes: 1 addition & 3 deletions packages/better-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
"require": "./dist/index.cjs"
}
},
"files": [
"dist"
],
"files": ["dist"],
"type": "module"
}
8 changes: 7 additions & 1 deletion packages/better-fetch/src/create-fetch/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ export type CreateFetchOption = BetterFetchOption & {
type WithRequired<T, K extends keyof T | never> = T & { [P in K]-?: T[P] };
type InferBody<T> = T extends ZodSchema ? z.input<T> : any;

type RemoveEmptyString<T> = T extends string ? ("" extends T ? never : T) : T;

type InferParamPath<Path> =
Path extends `${infer _Start}:${infer Param}/${infer Rest}`
? { [K in Param | keyof InferParamPath<Rest>]: string }
? {
[K in
| Param
| keyof InferParamPath<Rest> as RemoveEmptyString<K>]: string;
}
: Path extends `${infer _Start}:${infer Param}`
? { [K in Param]: string }
: Path extends `${infer _Start}/${infer Rest}`
Expand Down
16 changes: 16 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:
- 'packages/*'
- 'doc'
- "examples/*"
- "dev"

0 comments on commit 5142c45

Please sign in to comment.