@kevisual/query 0.0.38 → 0.0.39

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.
Files changed (8) hide show
  1. package/dist/query-adapter.d.ts +1 -1
  2. package/dist/query-adapter.js +7 -3
  3. package/dist/query-browser.d.ts +1 -1
  4. package/dist/query-browser.js +6 -2
  5. package/dist/query.d.ts +1 -1
  6. package/dist/query.js +6 -2
  7. package/package.json +1 -1
  8. package/src/adapter.ts +7 -3
package/dist/query-adapter.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- declare const methods: readonly ["GET", "POST"];
1
+ declare const methods: readonly ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
2
2
  type Method = (typeof methods)[number];
3
3
  type AdapterOpts = {
4
4
  url?: string;
package/dist/query-adapter.js CHANGED
@@ -1,4 +1,4 @@
1
- const methods = ['GET', 'POST'];
1
+ const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD'];
2
2
  const isTextForContentType = (contentType) => {
3
3
  if (!contentType)
4
4
  return false;
@@ -38,12 +38,16 @@ const adapter = async (opts = {}, overloadOpts) => {
38
38
  url = new URL(opts.url, origin);
39
39
  }
40
40
  const isGet = method === 'GET';
41
+ const oldSearchParams = url.searchParams;
41
42
  if (isGet) {
42
- let searchParams = new URLSearchParams(opts.body);
43
+ let searchParams = new URLSearchParams({ ...Object.fromEntries(oldSearchParams), ...opts.body });
43
44
  url.search = searchParams.toString();
44
45
  }
45
46
  else {
46
- const params = opts.params || {};
47
+ const params = {
48
+ ...Object.fromEntries(oldSearchParams),
49
+ ...opts.params,
50
+ };
47
51
  const searchParams = new URLSearchParams(params);
48
52
  if (typeof opts.body === 'object' && opts.body !== null) {
49
53
  // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
package/dist/query-browser.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { StoreApi } from 'zustand/vanilla';
2
2
 
3
- declare const methods: readonly ["GET", "POST"];
3
+ declare const methods: readonly ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
4
4
  type Method = (typeof methods)[number];
5
5
  type AdapterOpts = {
6
6
  url?: string;
package/dist/query-browser.js CHANGED
@@ -37,12 +37,16 @@ const adapter = async (opts = {}, overloadOpts) => {
37
37
  url = new URL(opts.url, origin);
38
38
  }
39
39
  const isGet = method === 'GET';
40
+ const oldSearchParams = url.searchParams;
40
41
  if (isGet) {
41
- let searchParams = new URLSearchParams(opts.body);
42
+ let searchParams = new URLSearchParams({ ...Object.fromEntries(oldSearchParams), ...opts.body });
42
43
  url.search = searchParams.toString();
43
44
  }
44
45
  else {
45
- const params = opts.params || {};
46
+ const params = {
47
+ ...Object.fromEntries(oldSearchParams),
48
+ ...opts.params,
49
+ };
46
50
  const searchParams = new URLSearchParams(params);
47
51
  if (typeof opts.body === 'object' && opts.body !== null) {
48
52
  // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
package/dist/query.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { StoreApi } from 'zustand/vanilla';
2
2
 
3
- declare const methods: readonly ["GET", "POST"];
3
+ declare const methods: readonly ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
4
4
  type Method = (typeof methods)[number];
5
5
  type AdapterOpts = {
6
6
  url?: string;
package/dist/query.js CHANGED
@@ -37,12 +37,16 @@ const adapter = async (opts = {}, overloadOpts) => {
37
37
  url = new URL(opts.url, origin);
38
38
  }
39
39
  const isGet = method === 'GET';
40
+ const oldSearchParams = url.searchParams;
40
41
  if (isGet) {
41
- let searchParams = new URLSearchParams(opts.body);
42
+ let searchParams = new URLSearchParams({ ...Object.fromEntries(oldSearchParams), ...opts.body });
42
43
  url.search = searchParams.toString();
43
44
  }
44
45
  else {
45
- const params = opts.params || {};
46
+ const params = {
47
+ ...Object.fromEntries(oldSearchParams),
48
+ ...opts.params,
49
+ };
46
50
  const searchParams = new URLSearchParams(params);
47
51
  if (typeof opts.body === 'object' && opts.body !== null) {
48
52
  // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kevisual/query",
3
- "version": "0.0.38",
3
+ "version": "0.0.39",
4
4
  "main": "dist/query-browser.js",
5
5
  "private": false,
6
6
  "type": "module",
package/src/adapter.ts CHANGED
@@ -1,4 +1,4 @@
1
- export const methods = ['GET', 'POST'] as const;
1
+ export const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD'] as const;
2
2
  export type Method = (typeof methods)[number];
3
3
 
4
4
  type SimpleObject = Record<string, any>;
@@ -64,11 +64,15 @@ export const adapter = async (opts: AdapterOpts = {}, overloadOpts?: RequestInit
64
64
  url = new URL(opts.url, origin);
65
65
  }
66
66
  const isGet = method === 'GET';
67
+ const oldSearchParams = url.searchParams;
67
68
  if (isGet) {
68
- let searchParams = new URLSearchParams(opts.body as SimpleObject);
69
+ let searchParams = new URLSearchParams({ ...Object.fromEntries(oldSearchParams), ...opts.body } as SimpleObject);
69
70
  url.search = searchParams.toString();
70
71
  } else {
71
- const params = opts.params || {};
72
+ const params = {
73
+ ...Object.fromEntries(oldSearchParams),
74
+ ...opts.params,
75
+ }
72
76
  const searchParams = new URLSearchParams(params as SimpleObject);
73
77
  if (typeof opts.body === 'object' && opts.body !== null) {
74
78
  // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题