@toa.io/origin 1.5.0 → 1.7.0

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.
package/dist/index.cjs CHANGED
@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
30
30
  // source/index.ts
31
31
  var index_exports = {};
32
32
  __export(index_exports, {
33
- connect: () => connect
33
+ connect: () => connect,
34
+ query: () => query
34
35
  });
35
36
  module.exports = __toCommonJS(index_exports);
36
37
 
@@ -154,8 +155,6 @@ var Resource = class {
154
155
  abs(rel) {
155
156
  const base = new URL(this.path, "uri://void");
156
157
  const url = new URL(rel, base);
157
- if (!url.pathname.endsWith("/"))
158
- url.pathname += "/";
159
158
  return url.pathname + url.search;
160
159
  }
161
160
  };
@@ -188,8 +187,52 @@ var Origin = class {
188
187
  function connect(options) {
189
188
  return new Origin(options);
190
189
  }
190
+
191
+ // source/criteria/range.ts
192
+ var range_exports = {};
193
+ __export(range_exports, {
194
+ format: () => format,
195
+ test: () => test
196
+ });
197
+ function test(value) {
198
+ return /^[[(]\d+\.\.\d+[\])]{1}$/.test(value);
199
+ }
200
+ function format(name, value) {
201
+ const [min, max] = value.slice(1, -1).split("..");
202
+ return [
203
+ `${name}${value.startsWith("(") ? ">" : ">="}${min}`,
204
+ `${name}${value.endsWith(")") ? "<" : "<="}${max}`
205
+ ];
206
+ }
207
+
208
+ // source/criteria/index.ts
209
+ var formats = [range_exports];
210
+
211
+ // source/query.ts
212
+ function query(params, options) {
213
+ if (params === void 0) return "";
214
+ const parts = [];
215
+ const criteria = [];
216
+ for (const [key, value] of params.entries()) {
217
+ const name = options?.map?.[key] ?? key;
218
+ if (SEPARATE.includes(name) || options?.separate?.includes(name) === true)
219
+ parts.push(`${name}=${value}`);
220
+ else {
221
+ const format2 = formats.find((format3) => format3.test(value));
222
+ if (format2 === void 0)
223
+ criteria.push(`${name}==${value}`);
224
+ else
225
+ criteria.push(...format2.format(name, value));
226
+ }
227
+ }
228
+ if (criteria.length > 0)
229
+ parts.unshift(`criteria=${criteria.join(";")}`);
230
+ return parts.length === 0 ? "" : "?" + parts.join("&");
231
+ }
232
+ var SEPARATE = ["omit", "limit", "search"];
191
233
  // Annotate the CommonJS export names for ESM import in node:
192
234
  0 && (module.exports = {
193
- connect
235
+ connect,
236
+ query
194
237
  });
195
238
  //# sourceMappingURL=index.cjs.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../source/index.ts","../source/Origin.ts","../source/Agent.ts","../source/Resource.ts"],"sourcesContent":["export { connect } from './Origin'\nexport type { GenericError } from './Error'\nexport type { OctetsEntry, WorkflowStep } from './Octets'\nexport type { RequestOptions } from './Agent'\n","import mitt from 'mitt'\nimport { Agent } from './Agent'\nimport { Resource } from './Resource'\nimport type { RequestOptions } from './Agent'\nimport type { Events } from './Events'\nimport type { Emitter } from 'mitt'\n\n/** Resoruce factory */\nclass Origin {\n public readonly events: Emitter<Events>\n private readonly agent: Agent\n\n constructor(options: Options) {\n this.events = mitt<Events>()\n\n this.agent = new Agent({\n origin: options.origin,\n events: this.events,\n })\n }\n\n public resource<T = unknown>(path: string, init?: Partial<RequestOptions>) {\n return new Resource<T>({\n agent: this.agent,\n path,\n init,\n })\n }\n\n public authenticate(challenge: string | null) {\n this.agent.authenticate(challenge)\n }\n\n public use(fetch: Fetch) {\n this.agent.use(fetch)\n }\n}\n\nfunction connect(options: Options) {\n return new Origin(options)\n}\n\ninterface Options {\n origin: string\n}\n\ntype Fetch = typeof fetch\n\nexport { connect }\n","import { Err } from 'error-value'\nimport { meros } from 'meros/browser'\nimport mitt from 'mitt'\nimport type { GenericError } from './Error'\nimport type { Events } from './Events'\nimport type { Faulty, OctetsEntry, WorkflowStep } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Agent {\n private readonly origin: string\n private readonly events: Emitter<Events>\n private fetch: Fetch = fetch\n\n private challenge: string | null = null\n\n constructor(options: Options) {\n this.origin = options.origin\n this.events = options.events\n }\n\n public async json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n const body = response.headers.get('content-type') === 'application/json'\n ? await response.json()\n : await response.text()\n\n if (response.ok)\n return body as T\n else {\n this.events.emit('error', { code: response.status, body })\n\n return new Err(response.status, body) as E\n }\n }\n\n public async multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n if (!response.ok)\n return new Err(response.status, await response.json())\n\n const generator = await meros(response) as AsyncGenerator<{ body: string }>\n const ack = await generator.next()\n\n if (JSON.parse(ack.value.body) !== 'ACK') throw new Error('No ACK')\n\n return (async function * () {\n for await (const chunk of generator) {\n const value = JSON.parse(chunk.body)\n\n if (value === 'FIN') return\n\n yield value\n }\n })()\n }\n\n public async octets<\n T extends Record<string, unknown> = Record<string, unknown>,\n E extends GenericError = GenericError\n >(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E> {\n const generator = await this.multipart<OctetsEntry | WorkflowStep>(path, init)\n\n if (generator instanceof Error) return generator as E\n\n const chunk = await generator.next()\n const entry = chunk.value as OctetsEntry\n const emitter = mitt<Faulty<T>>()\n\n void (async () => {\n for await (const part of (generator as AsyncGenerator<WorkflowStep>)) {\n const payload =\n part.status === 'completed'\n ? part.output\n : new Err(part.error?.code ?? 'UNKNOWN', part.error?.message)\n\n emitter.emit(part.step, payload as T[typeof part.step])\n }\n\n emitter.off('*')\n })()\n\n return [entry, emitter]\n }\n\n public authenticate(challenge: string | null) {\n this.challenge = challenge\n }\n\n public use(fetch: Fetch) {\n this.fetch = fetch\n }\n\n private setup(init?: RequestOptions): InitWithHeaders {\n init ??= {}\n init.headers ??= {}\n init.headers['accept'] ??= 'application/json'\n\n if (init.credentials === 'include' && init.headers['authorization'] === undefined) {\n if (this.challenge === null)\n throw new Error('Credentials must be set before sending authenticated request')\n\n init.headers['authorization'] = this.challenge\n delete init.credentials // no cookies\n }\n\n if (init.body !== undefined)\n if (init.body instanceof File || init.body instanceof ReadableStream) {\n init.method ??= 'POST'\n init.duplex = 'half'\n init.headers['content-type'] ??= (init.body as File).type ?? 'application/octet-stream'\n } else {\n init.body = JSON.stringify(init.body)\n init.headers['content-type'] ??= 'application/json'\n }\n\n return init as InitWithHeaders\n }\n\n private async request(path: string, init: RequestOptions): Promise<Response> {\n const url = new URL(path, this.origin)\n const response = await this.fetch(url.href, init)\n\n const challenge = response.headers.get('authorization')\n\n if (challenge !== null) {\n this.challenge = challenge\n this.events.emit('challenge', challenge)\n }\n\n return response\n }\n}\n\ninterface Options {\n origin: string\n events: Emitter<Events>\n}\n\ninterface RequestOptions extends Omit<RequestInit, 'path' | 'headers'> {\n duplex?: 'half'\n body?: any\n headers?: Record<string, string>\n}\n\ninterface InitWithHeaders extends RequestOptions {\n headers: Record<string, string>\n}\n\ntype Fetch = typeof fetch\n\nexport { Agent }\nexport type { RequestOptions }\n","import type { Agent, RequestOptions } from './Agent'\nimport type { GenericError } from './Error'\nimport type { Faulty, OctetsEntry } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Resource<T = unknown, E extends GenericError = GenericError> {\n private readonly agent: Agent\n private readonly path: string\n private readonly init?: Partial<RequestOptions>\n\n public constructor(options: Options) {\n this.agent = options.agent\n this.path = options.path\n this.init = options.init\n }\n\n public async json<R = T, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<R | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.json<R, F>(abs, options)\n }\n\n public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.octets<T, F>(abs, options)\n }\n\n private abs(rel: string): string {\n const base = new URL(this.path, 'uri://void')\n const url = new URL(rel, base)\n\n if (!url.pathname.endsWith('/'))\n url.pathname += '/'\n\n return url.pathname + url.search\n }\n}\n\ninterface Options {\n agent: Agent\n path: string\n init?: Partial<RequestOptions>\n}\n\nexport { Resource }\n"],"mappings":"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","names":["import_mitt","mitt","fetch","mitt","fetch"]}
1
+ {"version":3,"sources":["../source/index.ts","../source/Origin.ts","../source/Agent.ts","../source/Resource.ts","../source/criteria/range.ts","../source/criteria/index.ts","../source/query.ts"],"sourcesContent":["export { connect } from './Origin'\nexport { query } from './query'\nexport type { GenericError } from './Error'\nexport type { OctetsEntry, WorkflowStep } from './Octets'\nexport type { RequestOptions } from './Agent'\n","import mitt from 'mitt'\nimport { Agent } from './Agent'\nimport { Resource } from './Resource'\nimport type { RequestOptions } from './Agent'\nimport type { Events } from './Events'\nimport type { Emitter } from 'mitt'\n\n/** Resoruce factory */\nclass Origin {\n public readonly events: Emitter<Events>\n private readonly agent: Agent\n\n constructor(options: Options) {\n this.events = mitt<Events>()\n\n this.agent = new Agent({\n origin: options.origin,\n events: this.events,\n })\n }\n\n public resource<T = unknown>(path: string, init?: Partial<RequestOptions>) {\n return new Resource<T>({\n agent: this.agent,\n path,\n init,\n })\n }\n\n public authenticate(challenge: string | null) {\n this.agent.authenticate(challenge)\n }\n\n public use(fetch: Fetch) {\n this.agent.use(fetch)\n }\n}\n\nfunction connect(options: Options) {\n return new Origin(options)\n}\n\ninterface Options {\n origin: string\n}\n\ntype Fetch = typeof fetch\n\nexport { connect }\n","import { Err } from 'error-value'\nimport { meros } from 'meros/browser'\nimport mitt from 'mitt'\nimport type { GenericError } from './Error'\nimport type { Events } from './Events'\nimport type { Faulty, OctetsEntry, WorkflowStep } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Agent {\n private readonly origin: string\n private readonly events: Emitter<Events>\n private fetch: Fetch = fetch\n\n private challenge: string | null = null\n\n constructor(options: Options) {\n this.origin = options.origin\n this.events = options.events\n }\n\n public async json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n const body = response.headers.get('content-type') === 'application/json'\n ? await response.json()\n : await response.text()\n\n if (response.ok)\n return body as T\n else {\n this.events.emit('error', { code: response.status, body })\n\n return new Err(response.status, body) as E\n }\n }\n\n public async multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n if (!response.ok)\n return new Err(response.status, await response.json())\n\n const generator = await meros(response) as AsyncGenerator<{ body: string }>\n const ack = await generator.next()\n\n if (JSON.parse(ack.value.body) !== 'ACK') throw new Error('No ACK')\n\n return (async function * () {\n for await (const chunk of generator) {\n const value = JSON.parse(chunk.body)\n\n if (value === 'FIN') return\n\n yield value\n }\n })()\n }\n\n public async octets<\n T extends Record<string, unknown> = Record<string, unknown>,\n E extends GenericError = GenericError\n >(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E> {\n const generator = await this.multipart<OctetsEntry | WorkflowStep>(path, init)\n\n if (generator instanceof Error) return generator as E\n\n const chunk = await generator.next()\n const entry = chunk.value as OctetsEntry\n const emitter = mitt<Faulty<T>>()\n\n void (async () => {\n for await (const part of (generator as AsyncGenerator<WorkflowStep>)) {\n const payload =\n part.status === 'completed'\n ? part.output\n : new Err(part.error?.code ?? 'UNKNOWN', part.error?.message)\n\n emitter.emit(part.step, payload as T[typeof part.step])\n }\n\n emitter.off('*')\n })()\n\n return [entry, emitter]\n }\n\n public authenticate(challenge: string | null) {\n this.challenge = challenge\n }\n\n public use(fetch: Fetch) {\n this.fetch = fetch\n }\n\n private setup(init?: RequestOptions): InitWithHeaders {\n init ??= {}\n init.headers ??= {}\n init.headers['accept'] ??= 'application/json'\n\n if (init.credentials === 'include' && init.headers['authorization'] === undefined) {\n if (this.challenge === null)\n throw new Error('Credentials must be set before sending authenticated request')\n\n init.headers['authorization'] = this.challenge\n delete init.credentials // no cookies\n }\n\n if (init.body !== undefined)\n if (init.body instanceof File || init.body instanceof ReadableStream) {\n init.method ??= 'POST'\n init.duplex = 'half'\n init.headers['content-type'] ??= (init.body as File).type ?? 'application/octet-stream'\n } else {\n init.body = JSON.stringify(init.body)\n init.headers['content-type'] ??= 'application/json'\n }\n\n return init as InitWithHeaders\n }\n\n private async request(path: string, init: RequestOptions): Promise<Response> {\n const url = new URL(path, this.origin)\n const response = await this.fetch(url.href, init)\n\n const challenge = response.headers.get('authorization')\n\n if (challenge !== null) {\n this.challenge = challenge\n this.events.emit('challenge', challenge)\n }\n\n return response\n }\n}\n\ninterface Options {\n origin: string\n events: Emitter<Events>\n}\n\ninterface RequestOptions extends Omit<RequestInit, 'path' | 'headers'> {\n duplex?: 'half'\n body?: any\n headers?: Record<string, string>\n}\n\ninterface InitWithHeaders extends RequestOptions {\n headers: Record<string, string>\n}\n\ntype Fetch = typeof fetch\n\nexport { Agent }\nexport type { RequestOptions }\n","import type { Agent, RequestOptions } from './Agent'\nimport type { GenericError } from './Error'\nimport type { Faulty, OctetsEntry } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Resource<T = unknown, E extends GenericError = GenericError> {\n private readonly agent: Agent\n private readonly path: string\n private readonly init?: Partial<RequestOptions>\n\n public constructor(options: Options) {\n this.agent = options.agent\n this.path = options.path\n this.init = options.init\n }\n\n public async json<R = T, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<R | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.json<R, F>(abs, options)\n }\n\n public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.octets<T, F>(abs, options)\n }\n\n private abs(rel: string): string {\n const base = new URL(this.path, 'uri://void')\n const url = new URL(rel, base)\n\n return url.pathname + url.search\n }\n}\n\ninterface Options {\n agent: Agent\n path: string\n init?: Partial<RequestOptions>\n}\n\nexport { Resource }\n","/**\n *\n * @example\n * [10..20]\n * [10..20)\n * (10..20]\n * (10..20)\n */\nexport function test(value: string): boolean {\n return /^[[(]\\d+\\.\\.\\d+[\\])]{1}$/.test(value)\n}\n\nexport function format(name: string, value: string): string[] {\n const [min, max] = value.slice(1, -1).split('..')\n\n return [\n `${name}${value.startsWith('(') ? '>' : '>='}${min}`,\n `${name}${value.endsWith(')') ? '<' : '<='}${max}`,\n ]\n}\n","import * as range from './range'\nimport type { Format } from './Format'\n\nconst formats: Format[] = [range]\n\nexport { formats }\n","import { formats } from './criteria'\n\nfunction query(params?: URLSearchParams, options?: Options): string {\n if (params === undefined) return ''\n\n const parts: string[] = []\n const criteria: string[] = []\n\n for (const [key, value] of params.entries()) {\n const name = options?.map?.[key] ?? key\n\n if (SEPARATE.includes(name) || options?.separate?.includes(name) === true)\n parts.push(`${name}=${value}`)\n else {\n const format = formats.find((format) => format.test(value))\n\n if (format === undefined)\n criteria.push(`${name}==${value}`)\n else\n criteria.push(...format.format(name, value))\n }\n }\n\n if (criteria.length > 0)\n parts.unshift(`criteria=${criteria.join(';')}`)\n\n return parts.length === 0\n ? ''\n : '?' + parts.join('&')\n}\n\nconst SEPARATE: string[] = ['omit', 'limit', 'search'] as const\n\ninterface Options {\n separate?: string[]\n map?: Record<string, string>\n}\n\nexport { query }\n"],"mappings":"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","names":["import_mitt","mitt","fetch","mitt","fetch","format"]}
package/dist/index.d.cts CHANGED
@@ -27,7 +27,7 @@ declare class Agent {
27
27
  private readonly events;
28
28
  private fetch;
29
29
  private challenge;
30
- constructor(options: Options$2);
30
+ constructor(options: Options$3);
31
31
  json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E>;
32
32
  multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError>;
33
33
  octets<T extends Record<string, unknown> = Record<string, unknown>, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E>;
@@ -36,7 +36,7 @@ declare class Agent {
36
36
  private setup;
37
37
  private request;
38
38
  }
39
- interface Options$2 {
39
+ interface Options$3 {
40
40
  origin: string;
41
41
  events: Emitter<Events>;
42
42
  }
@@ -51,12 +51,12 @@ declare class Resource<T = unknown, E extends GenericError = GenericError> {
51
51
  private readonly agent;
52
52
  private readonly path;
53
53
  private readonly init?;
54
- constructor(options: Options$1);
54
+ constructor(options: Options$2);
55
55
  json<R = T, F extends E = E>(rel?: string, init?: RequestOptions): Promise<R | F>;
56
56
  octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel?: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
57
57
  private abs;
58
58
  }
59
- interface Options$1 {
59
+ interface Options$2 {
60
60
  agent: Agent;
61
61
  path: string;
62
62
  init?: Partial<RequestOptions>;
@@ -66,15 +66,21 @@ interface Options$1 {
66
66
  declare class Origin {
67
67
  readonly events: Emitter<Events>;
68
68
  private readonly agent;
69
- constructor(options: Options);
69
+ constructor(options: Options$1);
70
70
  resource<T = unknown>(path: string, init?: Partial<RequestOptions>): Resource<T, GenericError>;
71
71
  authenticate(challenge: string | null): void;
72
72
  use(fetch: Fetch): void;
73
73
  }
74
- declare function connect(options: Options): Origin;
75
- interface Options {
74
+ declare function connect(options: Options$1): Origin;
75
+ interface Options$1 {
76
76
  origin: string;
77
77
  }
78
78
  type Fetch = typeof fetch;
79
79
 
80
- export { type GenericError, type OctetsEntry, type RequestOptions, type WorkflowStep, connect };
80
+ declare function query(params?: URLSearchParams, options?: Options): string;
81
+ interface Options {
82
+ separate?: string[];
83
+ map?: Record<string, string>;
84
+ }
85
+
86
+ export { type GenericError, type OctetsEntry, type RequestOptions, type WorkflowStep, connect, query };
package/dist/index.d.ts CHANGED
@@ -27,7 +27,7 @@ declare class Agent {
27
27
  private readonly events;
28
28
  private fetch;
29
29
  private challenge;
30
- constructor(options: Options$2);
30
+ constructor(options: Options$3);
31
31
  json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E>;
32
32
  multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError>;
33
33
  octets<T extends Record<string, unknown> = Record<string, unknown>, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E>;
@@ -36,7 +36,7 @@ declare class Agent {
36
36
  private setup;
37
37
  private request;
38
38
  }
39
- interface Options$2 {
39
+ interface Options$3 {
40
40
  origin: string;
41
41
  events: Emitter<Events>;
42
42
  }
@@ -51,12 +51,12 @@ declare class Resource<T = unknown, E extends GenericError = GenericError> {
51
51
  private readonly agent;
52
52
  private readonly path;
53
53
  private readonly init?;
54
- constructor(options: Options$1);
54
+ constructor(options: Options$2);
55
55
  json<R = T, F extends E = E>(rel?: string, init?: RequestOptions): Promise<R | F>;
56
56
  octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel?: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
57
57
  private abs;
58
58
  }
59
- interface Options$1 {
59
+ interface Options$2 {
60
60
  agent: Agent;
61
61
  path: string;
62
62
  init?: Partial<RequestOptions>;
@@ -66,15 +66,21 @@ interface Options$1 {
66
66
  declare class Origin {
67
67
  readonly events: Emitter<Events>;
68
68
  private readonly agent;
69
- constructor(options: Options);
69
+ constructor(options: Options$1);
70
70
  resource<T = unknown>(path: string, init?: Partial<RequestOptions>): Resource<T, GenericError>;
71
71
  authenticate(challenge: string | null): void;
72
72
  use(fetch: Fetch): void;
73
73
  }
74
- declare function connect(options: Options): Origin;
75
- interface Options {
74
+ declare function connect(options: Options$1): Origin;
75
+ interface Options$1 {
76
76
  origin: string;
77
77
  }
78
78
  type Fetch = typeof fetch;
79
79
 
80
- export { type GenericError, type OctetsEntry, type RequestOptions, type WorkflowStep, connect };
80
+ declare function query(params?: URLSearchParams, options?: Options): string;
81
+ interface Options {
82
+ separate?: string[];
83
+ map?: Record<string, string>;
84
+ }
85
+
86
+ export { type GenericError, type OctetsEntry, type RequestOptions, type WorkflowStep, connect, query };
package/dist/index.js CHANGED
@@ -1,3 +1,9 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __export = (target, all) => {
3
+ for (var name in all)
4
+ __defProp(target, name, { get: all[name], enumerable: true });
5
+ };
6
+
1
7
  // source/Origin.ts
2
8
  import mitt2 from "mitt";
3
9
 
@@ -118,8 +124,6 @@ var Resource = class {
118
124
  abs(rel) {
119
125
  const base = new URL(this.path, "uri://void");
120
126
  const url = new URL(rel, base);
121
- if (!url.pathname.endsWith("/"))
122
- url.pathname += "/";
123
127
  return url.pathname + url.search;
124
128
  }
125
129
  };
@@ -152,7 +156,51 @@ var Origin = class {
152
156
  function connect(options) {
153
157
  return new Origin(options);
154
158
  }
159
+
160
+ // source/criteria/range.ts
161
+ var range_exports = {};
162
+ __export(range_exports, {
163
+ format: () => format,
164
+ test: () => test
165
+ });
166
+ function test(value) {
167
+ return /^[[(]\d+\.\.\d+[\])]{1}$/.test(value);
168
+ }
169
+ function format(name, value) {
170
+ const [min, max] = value.slice(1, -1).split("..");
171
+ return [
172
+ `${name}${value.startsWith("(") ? ">" : ">="}${min}`,
173
+ `${name}${value.endsWith(")") ? "<" : "<="}${max}`
174
+ ];
175
+ }
176
+
177
+ // source/criteria/index.ts
178
+ var formats = [range_exports];
179
+
180
+ // source/query.ts
181
+ function query(params, options) {
182
+ if (params === void 0) return "";
183
+ const parts = [];
184
+ const criteria = [];
185
+ for (const [key, value] of params.entries()) {
186
+ const name = options?.map?.[key] ?? key;
187
+ if (SEPARATE.includes(name) || options?.separate?.includes(name) === true)
188
+ parts.push(`${name}=${value}`);
189
+ else {
190
+ const format2 = formats.find((format3) => format3.test(value));
191
+ if (format2 === void 0)
192
+ criteria.push(`${name}==${value}`);
193
+ else
194
+ criteria.push(...format2.format(name, value));
195
+ }
196
+ }
197
+ if (criteria.length > 0)
198
+ parts.unshift(`criteria=${criteria.join(";")}`);
199
+ return parts.length === 0 ? "" : "?" + parts.join("&");
200
+ }
201
+ var SEPARATE = ["omit", "limit", "search"];
155
202
  export {
156
- connect
203
+ connect,
204
+ query
157
205
  };
158
206
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../source/Origin.ts","../source/Agent.ts","../source/Resource.ts"],"sourcesContent":["import mitt from 'mitt'\nimport { Agent } from './Agent'\nimport { Resource } from './Resource'\nimport type { RequestOptions } from './Agent'\nimport type { Events } from './Events'\nimport type { Emitter } from 'mitt'\n\n/** Resoruce factory */\nclass Origin {\n public readonly events: Emitter<Events>\n private readonly agent: Agent\n\n constructor(options: Options) {\n this.events = mitt<Events>()\n\n this.agent = new Agent({\n origin: options.origin,\n events: this.events,\n })\n }\n\n public resource<T = unknown>(path: string, init?: Partial<RequestOptions>) {\n return new Resource<T>({\n agent: this.agent,\n path,\n init,\n })\n }\n\n public authenticate(challenge: string | null) {\n this.agent.authenticate(challenge)\n }\n\n public use(fetch: Fetch) {\n this.agent.use(fetch)\n }\n}\n\nfunction connect(options: Options) {\n return new Origin(options)\n}\n\ninterface Options {\n origin: string\n}\n\ntype Fetch = typeof fetch\n\nexport { connect }\n","import { Err } from 'error-value'\nimport { meros } from 'meros/browser'\nimport mitt from 'mitt'\nimport type { GenericError } from './Error'\nimport type { Events } from './Events'\nimport type { Faulty, OctetsEntry, WorkflowStep } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Agent {\n private readonly origin: string\n private readonly events: Emitter<Events>\n private fetch: Fetch = fetch\n\n private challenge: string | null = null\n\n constructor(options: Options) {\n this.origin = options.origin\n this.events = options.events\n }\n\n public async json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n const body = response.headers.get('content-type') === 'application/json'\n ? await response.json()\n : await response.text()\n\n if (response.ok)\n return body as T\n else {\n this.events.emit('error', { code: response.status, body })\n\n return new Err(response.status, body) as E\n }\n }\n\n public async multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n if (!response.ok)\n return new Err(response.status, await response.json())\n\n const generator = await meros(response) as AsyncGenerator<{ body: string }>\n const ack = await generator.next()\n\n if (JSON.parse(ack.value.body) !== 'ACK') throw new Error('No ACK')\n\n return (async function * () {\n for await (const chunk of generator) {\n const value = JSON.parse(chunk.body)\n\n if (value === 'FIN') return\n\n yield value\n }\n })()\n }\n\n public async octets<\n T extends Record<string, unknown> = Record<string, unknown>,\n E extends GenericError = GenericError\n >(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E> {\n const generator = await this.multipart<OctetsEntry | WorkflowStep>(path, init)\n\n if (generator instanceof Error) return generator as E\n\n const chunk = await generator.next()\n const entry = chunk.value as OctetsEntry\n const emitter = mitt<Faulty<T>>()\n\n void (async () => {\n for await (const part of (generator as AsyncGenerator<WorkflowStep>)) {\n const payload =\n part.status === 'completed'\n ? part.output\n : new Err(part.error?.code ?? 'UNKNOWN', part.error?.message)\n\n emitter.emit(part.step, payload as T[typeof part.step])\n }\n\n emitter.off('*')\n })()\n\n return [entry, emitter]\n }\n\n public authenticate(challenge: string | null) {\n this.challenge = challenge\n }\n\n public use(fetch: Fetch) {\n this.fetch = fetch\n }\n\n private setup(init?: RequestOptions): InitWithHeaders {\n init ??= {}\n init.headers ??= {}\n init.headers['accept'] ??= 'application/json'\n\n if (init.credentials === 'include' && init.headers['authorization'] === undefined) {\n if (this.challenge === null)\n throw new Error('Credentials must be set before sending authenticated request')\n\n init.headers['authorization'] = this.challenge\n delete init.credentials // no cookies\n }\n\n if (init.body !== undefined)\n if (init.body instanceof File || init.body instanceof ReadableStream) {\n init.method ??= 'POST'\n init.duplex = 'half'\n init.headers['content-type'] ??= (init.body as File).type ?? 'application/octet-stream'\n } else {\n init.body = JSON.stringify(init.body)\n init.headers['content-type'] ??= 'application/json'\n }\n\n return init as InitWithHeaders\n }\n\n private async request(path: string, init: RequestOptions): Promise<Response> {\n const url = new URL(path, this.origin)\n const response = await this.fetch(url.href, init)\n\n const challenge = response.headers.get('authorization')\n\n if (challenge !== null) {\n this.challenge = challenge\n this.events.emit('challenge', challenge)\n }\n\n return response\n }\n}\n\ninterface Options {\n origin: string\n events: Emitter<Events>\n}\n\ninterface RequestOptions extends Omit<RequestInit, 'path' | 'headers'> {\n duplex?: 'half'\n body?: any\n headers?: Record<string, string>\n}\n\ninterface InitWithHeaders extends RequestOptions {\n headers: Record<string, string>\n}\n\ntype Fetch = typeof fetch\n\nexport { Agent }\nexport type { RequestOptions }\n","import type { Agent, RequestOptions } from './Agent'\nimport type { GenericError } from './Error'\nimport type { Faulty, OctetsEntry } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Resource<T = unknown, E extends GenericError = GenericError> {\n private readonly agent: Agent\n private readonly path: string\n private readonly init?: Partial<RequestOptions>\n\n public constructor(options: Options) {\n this.agent = options.agent\n this.path = options.path\n this.init = options.init\n }\n\n public async json<R = T, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<R | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.json<R, F>(abs, options)\n }\n\n public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.octets<T, F>(abs, options)\n }\n\n private abs(rel: string): string {\n const base = new URL(this.path, 'uri://void')\n const url = new URL(rel, base)\n\n if (!url.pathname.endsWith('/'))\n url.pathname += '/'\n\n return url.pathname + url.search\n }\n}\n\ninterface Options {\n agent: Agent\n path: string\n init?: Partial<RequestOptions>\n}\n\nexport { Resource }\n"],"mappings":"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","names":["mitt","fetch","mitt","fetch"]}
1
+ {"version":3,"sources":["../source/Origin.ts","../source/Agent.ts","../source/Resource.ts","../source/criteria/range.ts","../source/criteria/index.ts","../source/query.ts"],"sourcesContent":["import mitt from 'mitt'\nimport { Agent } from './Agent'\nimport { Resource } from './Resource'\nimport type { RequestOptions } from './Agent'\nimport type { Events } from './Events'\nimport type { Emitter } from 'mitt'\n\n/** Resoruce factory */\nclass Origin {\n public readonly events: Emitter<Events>\n private readonly agent: Agent\n\n constructor(options: Options) {\n this.events = mitt<Events>()\n\n this.agent = new Agent({\n origin: options.origin,\n events: this.events,\n })\n }\n\n public resource<T = unknown>(path: string, init?: Partial<RequestOptions>) {\n return new Resource<T>({\n agent: this.agent,\n path,\n init,\n })\n }\n\n public authenticate(challenge: string | null) {\n this.agent.authenticate(challenge)\n }\n\n public use(fetch: Fetch) {\n this.agent.use(fetch)\n }\n}\n\nfunction connect(options: Options) {\n return new Origin(options)\n}\n\ninterface Options {\n origin: string\n}\n\ntype Fetch = typeof fetch\n\nexport { connect }\n","import { Err } from 'error-value'\nimport { meros } from 'meros/browser'\nimport mitt from 'mitt'\nimport type { GenericError } from './Error'\nimport type { Events } from './Events'\nimport type { Faulty, OctetsEntry, WorkflowStep } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Agent {\n private readonly origin: string\n private readonly events: Emitter<Events>\n private fetch: Fetch = fetch\n\n private challenge: string | null = null\n\n constructor(options: Options) {\n this.origin = options.origin\n this.events = options.events\n }\n\n public async json<T, E extends GenericError = GenericError>(path: string, init?: RequestOptions): Promise<T | E> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n const body = response.headers.get('content-type') === 'application/json'\n ? await response.json()\n : await response.text()\n\n if (response.ok)\n return body as T\n else {\n this.events.emit('error', { code: response.status, body })\n\n return new Err(response.status, body) as E\n }\n }\n\n public async multipart<T = unknown>(path: string, init?: RequestOptions): Promise<AsyncGenerator<T, void, undefined> | GenericError> {\n const options = this.setup(init)\n const response = await this.request(path, options)\n\n if (!response.ok)\n return new Err(response.status, await response.json())\n\n const generator = await meros(response) as AsyncGenerator<{ body: string }>\n const ack = await generator.next()\n\n if (JSON.parse(ack.value.body) !== 'ACK') throw new Error('No ACK')\n\n return (async function * () {\n for await (const chunk of generator) {\n const value = JSON.parse(chunk.body)\n\n if (value === 'FIN') return\n\n yield value\n }\n })()\n }\n\n public async octets<\n T extends Record<string, unknown> = Record<string, unknown>,\n E extends GenericError = GenericError\n >(path: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | E> {\n const generator = await this.multipart<OctetsEntry | WorkflowStep>(path, init)\n\n if (generator instanceof Error) return generator as E\n\n const chunk = await generator.next()\n const entry = chunk.value as OctetsEntry\n const emitter = mitt<Faulty<T>>()\n\n void (async () => {\n for await (const part of (generator as AsyncGenerator<WorkflowStep>)) {\n const payload =\n part.status === 'completed'\n ? part.output\n : new Err(part.error?.code ?? 'UNKNOWN', part.error?.message)\n\n emitter.emit(part.step, payload as T[typeof part.step])\n }\n\n emitter.off('*')\n })()\n\n return [entry, emitter]\n }\n\n public authenticate(challenge: string | null) {\n this.challenge = challenge\n }\n\n public use(fetch: Fetch) {\n this.fetch = fetch\n }\n\n private setup(init?: RequestOptions): InitWithHeaders {\n init ??= {}\n init.headers ??= {}\n init.headers['accept'] ??= 'application/json'\n\n if (init.credentials === 'include' && init.headers['authorization'] === undefined) {\n if (this.challenge === null)\n throw new Error('Credentials must be set before sending authenticated request')\n\n init.headers['authorization'] = this.challenge\n delete init.credentials // no cookies\n }\n\n if (init.body !== undefined)\n if (init.body instanceof File || init.body instanceof ReadableStream) {\n init.method ??= 'POST'\n init.duplex = 'half'\n init.headers['content-type'] ??= (init.body as File).type ?? 'application/octet-stream'\n } else {\n init.body = JSON.stringify(init.body)\n init.headers['content-type'] ??= 'application/json'\n }\n\n return init as InitWithHeaders\n }\n\n private async request(path: string, init: RequestOptions): Promise<Response> {\n const url = new URL(path, this.origin)\n const response = await this.fetch(url.href, init)\n\n const challenge = response.headers.get('authorization')\n\n if (challenge !== null) {\n this.challenge = challenge\n this.events.emit('challenge', challenge)\n }\n\n return response\n }\n}\n\ninterface Options {\n origin: string\n events: Emitter<Events>\n}\n\ninterface RequestOptions extends Omit<RequestInit, 'path' | 'headers'> {\n duplex?: 'half'\n body?: any\n headers?: Record<string, string>\n}\n\ninterface InitWithHeaders extends RequestOptions {\n headers: Record<string, string>\n}\n\ntype Fetch = typeof fetch\n\nexport { Agent }\nexport type { RequestOptions }\n","import type { Agent, RequestOptions } from './Agent'\nimport type { GenericError } from './Error'\nimport type { Faulty, OctetsEntry } from './Octets'\nimport type { Emitter } from 'mitt'\n\nclass Resource<T = unknown, E extends GenericError = GenericError> {\n private readonly agent: Agent\n private readonly path: string\n private readonly init?: Partial<RequestOptions>\n\n public constructor(options: Options) {\n this.agent = options.agent\n this.path = options.path\n this.init = options.init\n }\n\n public async json<R = T, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<R | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.json<R, F>(abs, options)\n }\n\n public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n const abs = this.abs(rel)\n const options = Object.assign({}, this.init, init)\n\n return await this.agent.octets<T, F>(abs, options)\n }\n\n private abs(rel: string): string {\n const base = new URL(this.path, 'uri://void')\n const url = new URL(rel, base)\n\n return url.pathname + url.search\n }\n}\n\ninterface Options {\n agent: Agent\n path: string\n init?: Partial<RequestOptions>\n}\n\nexport { Resource }\n","/**\n *\n * @example\n * [10..20]\n * [10..20)\n * (10..20]\n * (10..20)\n */\nexport function test(value: string): boolean {\n return /^[[(]\\d+\\.\\.\\d+[\\])]{1}$/.test(value)\n}\n\nexport function format(name: string, value: string): string[] {\n const [min, max] = value.slice(1, -1).split('..')\n\n return [\n `${name}${value.startsWith('(') ? '>' : '>='}${min}`,\n `${name}${value.endsWith(')') ? '<' : '<='}${max}`,\n ]\n}\n","import * as range from './range'\nimport type { Format } from './Format'\n\nconst formats: Format[] = [range]\n\nexport { formats }\n","import { formats } from './criteria'\n\nfunction query(params?: URLSearchParams, options?: Options): string {\n if (params === undefined) return ''\n\n const parts: string[] = []\n const criteria: string[] = []\n\n for (const [key, value] of params.entries()) {\n const name = options?.map?.[key] ?? key\n\n if (SEPARATE.includes(name) || options?.separate?.includes(name) === true)\n parts.push(`${name}=${value}`)\n else {\n const format = formats.find((format) => format.test(value))\n\n if (format === undefined)\n criteria.push(`${name}==${value}`)\n else\n criteria.push(...format.format(name, value))\n }\n }\n\n if (criteria.length > 0)\n parts.unshift(`criteria=${criteria.join(';')}`)\n\n return parts.length === 0\n ? ''\n : '?' + parts.join('&')\n}\n\nconst SEPARATE: string[] = ['omit', 'limit', 'search'] as const\n\ninterface Options {\n separate?: string[]\n map?: Record<string, string>\n}\n\nexport { query }\n"],"mappings":"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","names":["mitt","fetch","mitt","fetch","format"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toa.io/origin",
3
- "version": "1.5.0",
3
+ "version": "1.7.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -42,6 +42,7 @@
42
42
  "husky": "^9.1.7",
43
43
  "neostandard": "^0.12.2",
44
44
  "semantic-release": "^24.2.9",
45
+ "ts-node": "^10.9.2",
45
46
  "tsup": "^8.5.0"
46
47
  },
47
48
  "scripts": {
@@ -50,7 +51,7 @@
50
51
  "prepublishOnly": "npm run build",
51
52
  "lint": "eslint .",
52
53
  "format": "eslint . --fix",
53
- "test": "npm run lint && node --test",
54
+ "test": "npm run lint && npx tsx --test",
54
55
  "ci": "rm -rf node_modules && rm -rf package-lock.json && npm i"
55
56
  },
56
57
  "dependencies": {
@@ -32,9 +32,6 @@ class Resource<T = unknown, E extends GenericError = GenericError> {
32
32
  const base = new URL(this.path, 'uri://void')
33
33
  const url = new URL(rel, base)
34
34
 
35
- if (!url.pathname.endsWith('/'))
36
- url.pathname += '/'
37
-
38
35
  return url.pathname + url.search
39
36
  }
40
37
  }
@@ -0,0 +1,4 @@
1
+ export interface Format {
2
+ test(value: string): boolean
3
+ format(name: string, value: string): string[]
4
+ }
@@ -0,0 +1,6 @@
1
+ import * as range from './range'
2
+ import type { Format } from './Format'
3
+
4
+ const formats: Format[] = [range]
5
+
6
+ export { formats }
@@ -0,0 +1,20 @@
1
+ /**
2
+ *
3
+ * @example
4
+ * [10..20]
5
+ * [10..20)
6
+ * (10..20]
7
+ * (10..20)
8
+ */
9
+ export function test(value: string): boolean {
10
+ return /^[[(]\d+\.\.\d+[\])]{1}$/.test(value)
11
+ }
12
+
13
+ export function format(name: string, value: string): string[] {
14
+ const [min, max] = value.slice(1, -1).split('..')
15
+
16
+ return [
17
+ `${name}${value.startsWith('(') ? '>' : '>='}${min}`,
18
+ `${name}${value.endsWith(')') ? '<' : '<='}${max}`,
19
+ ]
20
+ }
package/source/index.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export { connect } from './Origin'
2
+ export { query } from './query'
2
3
  export type { GenericError } from './Error'
3
4
  export type { OctetsEntry, WorkflowStep } from './Octets'
4
5
  export type { RequestOptions } from './Agent'
@@ -0,0 +1,70 @@
1
+ import assert from 'node:assert/strict'
2
+ import { it } from 'node:test'
3
+ import { query } from './query'
4
+
5
+ it('should build criteria', () => {
6
+ const params = new URLSearchParams()
7
+
8
+ params.set('foo', 'bar')
9
+ params.set('baz', 'qux')
10
+
11
+ const result = query(params)
12
+
13
+ assert.equal(result, '?criteria=foo==bar;baz==qux')
14
+ })
15
+
16
+ it('should build empty criteria', () => {
17
+ const params = new URLSearchParams()
18
+
19
+ const result = query(params)
20
+
21
+ assert.equal(result, '')
22
+ })
23
+
24
+ it('should separate known parameters', () => {
25
+ const params = new URLSearchParams()
26
+
27
+ params.set('foo', 'bar')
28
+ params.set('omit', '10')
29
+ params.set('limit', '20')
30
+ params.set('search', 'qux')
31
+
32
+ const result = query(params)
33
+
34
+ assert.equal(result, '?criteria=foo==bar&omit=10&limit=20&search=qux')
35
+ })
36
+
37
+ it('should separate specified parameters', () => {
38
+ const params = new URLSearchParams()
39
+
40
+ params.set('foo', 'bar')
41
+ params.set('baz', 'qux')
42
+
43
+ const result = query(params, { separate: ['baz'] })
44
+
45
+ assert.equal(result, '?criteria=foo==bar&baz=qux')
46
+ })
47
+
48
+ it('should map parameters', () => {
49
+ const params = new URLSearchParams()
50
+
51
+ params.set('foo', 'bar')
52
+ params.set('baz', 'baz')
53
+ params.set('quz', 'qux')
54
+ params.set('max', '10')
55
+
56
+ const result = query(params, { separate: ['qux'], map: { foo: 'bar', quz: 'qux', max: 'limit' } })
57
+
58
+ assert.equal(result, '?criteria=bar==bar;baz==baz&qux=qux&limit=10')
59
+ })
60
+
61
+ it('should parse ranges', () => {
62
+ const params = new URLSearchParams()
63
+
64
+ params.set('foo', '[10..20]')
65
+ params.set('bar', '[10..20)')
66
+
67
+ const result = query(params)
68
+
69
+ assert.equal(result, '?criteria=foo>=10;foo<=20;bar>=10;bar<20')
70
+ })
@@ -0,0 +1,39 @@
1
+ import { formats } from './criteria'
2
+
3
+ function query(params?: URLSearchParams, options?: Options): string {
4
+ if (params === undefined) return ''
5
+
6
+ const parts: string[] = []
7
+ const criteria: string[] = []
8
+
9
+ for (const [key, value] of params.entries()) {
10
+ const name = options?.map?.[key] ?? key
11
+
12
+ if (SEPARATE.includes(name) || options?.separate?.includes(name) === true)
13
+ parts.push(`${name}=${value}`)
14
+ else {
15
+ const format = formats.find((format) => format.test(value))
16
+
17
+ if (format === undefined)
18
+ criteria.push(`${name}==${value}`)
19
+ else
20
+ criteria.push(...format.format(name, value))
21
+ }
22
+ }
23
+
24
+ if (criteria.length > 0)
25
+ parts.unshift(`criteria=${criteria.join(';')}`)
26
+
27
+ return parts.length === 0
28
+ ? ''
29
+ : '?' + parts.join('&')
30
+ }
31
+
32
+ const SEPARATE: string[] = ['omit', 'limit', 'search'] as const
33
+
34
+ interface Options {
35
+ separate?: string[]
36
+ map?: Record<string, string>
37
+ }
38
+
39
+ export { query }