@toa.io/origin 1.7.0 → 1.10.0

package/README.md

@@ -8,11 +8,11 @@
 import { connect } from '@toa.io/origin'
 import type { MyEntity } from './MyEntity'
 
-const origin = connect({ origin: 'https://my-origin.com' })
+const origin = connect('https://my-origin.com')
 const favorites = origin.resource<Favorite>('/favorites/')
 
 export async function get(): Promise<Favorite[] | Error> {
-  return favorites.json<Favorite[]>('', { method: 'GET' })
+  return favorites.json<Favorite[]>({ method: 'GET' })
 }
 
 // POST /favorites/:identity/ with typed body

package/dist/index.cjs

@@ -142,12 +142,16 @@ var Resource = class {
     this.path = options.path;
     this.init = options.init;
   }
-  async json(rel = "", init) {
+  async json(relOrInit, init) {
+    const rel = typeof relOrInit === "string" ? relOrInit : "";
+    init = typeof relOrInit === "string" ? init : relOrInit;
     const abs = this.abs(rel);
     const options = Object.assign({}, this.init, init);
     return await this.agent.json(abs, options);
   }
-  async octets(rel = "", init) {
+  async octets(relOrInit, init) {
+    const rel = typeof relOrInit === "string" ? relOrInit : "";
+    init = typeof relOrInit === "string" ? init : relOrInit;
     const abs = this.abs(rel);
     const options = Object.assign({}, this.init, init);
     return await this.agent.octets(abs, options);
@@ -155,6 +159,8 @@ var Resource = class {
   abs(rel) {
     const base = new URL(this.path, "uri://void");
     const url = new URL(rel, base);
+    if (!url.pathname.endsWith("/"))
+      url.pathname += "/";
     return url.pathname + url.search;
   }
 };
@@ -185,6 +191,8 @@ var Origin = class {
   }
 };
 function connect(options) {
+  if (typeof options === "string")
+    options = { origin: options };
   return new Origin(options);
 }
 

package/dist/index.cjs.map

@@ -1 +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"]}
+{"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 | string) {\n  if (typeof options === 'string')\n    options = { origin: options }\n\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>(init?: RequestOptions): Promise<R | F>\n  public async json<R = T, F extends E = E>(rel: string, init?: RequestOptions): Promise<R | F>\n  public async json<R = T, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<R | F> {\n    const rel = typeof relOrInit === 'string' ? relOrInit : ''\n\n    init = typeof relOrInit === 'string' ? init : relOrInit\n\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>(init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>\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  public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n    const rel = typeof relOrInit === 'string' ? relOrInit : ''\n\n    init = typeof relOrInit === 'string' ? init : relOrInit\n\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    // Allows to use resource.json(id) instead of resource.json(id + '/')\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","/**\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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,IAAAA,eAAiB;;;ACAjB,yBAAoB;AACpB,qBAAsB;AACtB,kBAAiB;AAMjB,IAAM,QAAN,MAAY;AAAA,EACO;AAAA,EACA;AAAA,EACT,QAAe;AAAA,EAEf,YAA2B;AAAA,EAEnC,YAAY,SAAkB;AAC5B,SAAK,SAAS,QAAQ;AACtB,SAAK,SAAS,QAAQ;AAAA,EACxB;AAAA,EAEA,MAAa,KAA+C,MAAc,MAAuC;AAC/G,UAAM,UAAU,KAAK,MAAM,IAAI;AAC/B,UAAM,WAAW,MAAM,KAAK,QAAQ,MAAM,OAAO;AAEjD,UAAM,OAAO,SAAS,QAAQ,IAAI,cAAc,MAAM,qBAClD,MAAM,SAAS,KAAK,IACpB,MAAM,SAAS,KAAK;AAExB,QAAI,SAAS;AACX,aAAO;AAAA,SACJ;AACH,WAAK,OAAO,KAAK,SAAS,EAAE,MAAM,SAAS,QAAQ,KAAK,CAAC;AAEzD,aAAO,IAAI,uBAAI,SAAS,QAAQ,IAAI;AAAA,IACtC;AAAA,EACF;AAAA,EAEA,MAAa,UAAuB,MAAc,MAAmF;AACnI,UAAM,UAAU,KAAK,MAAM,IAAI;AAC/B,UAAM,WAAW,MAAM,KAAK,QAAQ,MAAM,OAAO;AAEjD,QAAI,CAAC,SAAS;AACZ,aAAO,IAAI,uBAAI,SAAS,QAAQ,MAAM,SAAS,KAAK,CAAC;AAEvD,UAAM,YAAY,UAAM,sBAAM,QAAQ;AACtC,UAAM,MAAM,MAAM,UAAU,KAAK;AAEjC,QAAI,KAAK,MAAM,IAAI,MAAM,IAAI,MAAM,MAAO,OAAM,IAAI,MAAM,QAAQ;AAElE,YAAQ,mBAAoB;AAC1B,uBAAiB,SAAS,WAAW;AACnC,cAAM,QAAQ,KAAK,MAAM,MAAM,IAAI;AAEnC,YAAI,UAAU,MAAO;AAErB,cAAM;AAAA,MACR;AAAA,IACF,GAAG;AAAA,EACL;AAAA,EAEA,MAAa,OAGX,MAAc,MAAuE;AACrF,UAAM,YAAY,MAAM,KAAK,UAAsC,MAAM,IAAI;AAE7E,QAAI,qBAAqB,MAAO,QAAO;AAEvC,UAAM,QAAQ,MAAM,UAAU,KAAK;AACnC,UAAM,QAAQ,MAAM;AACpB,UAAM,cAAU,YAAAC,SAAgB;AAEhC,UAAM,YAAY;AAChB,uBAAiB,QAAS,WAA4C;AACpE,cAAM,UACJ,KAAK,WAAW,cACZ,KAAK,SACL,IAAI,uBAAI,KAAK,OAAO,QAAQ,WAAW,KAAK,OAAO,OAAO;AAEhE,gBAAQ,KAAK,KAAK,MAAM,OAA8B;AAAA,MACxD;AAEA,cAAQ,IAAI,GAAG;AAAA,IACjB,GAAG;AAEH,WAAO,CAAC,OAAO,OAAO;AAAA,EACxB;AAAA,EAEO,aAAa,WAA0B;AAC5C,SAAK,YAAY;AAAA,EACnB;AAAA,EAEO,IAAIC,QAAc;AACvB,SAAK,QAAQA;AAAA,EACf;AAAA,EAEQ,MAAM,MAAwC;AACpD,aAAS,CAAC;AACV,SAAK,YAAY,CAAC;AAClB,SAAK,QAAQ,QAAQ,MAAM;AAE3B,QAAI,KAAK,gBAAgB,aAAa,KAAK,QAAQ,eAAe,MAAM,QAAW;AACjF,UAAI,KAAK,cAAc;AACrB,cAAM,IAAI,MAAM,8DAA8D;AAEhF,WAAK,QAAQ,eAAe,IAAI,KAAK;AACrC,aAAO,KAAK;AAAA,IACd;AAEA,QAAI,KAAK,SAAS;AAChB,UAAI,KAAK,gBAAgB,QAAQ,KAAK,gBAAgB,gBAAgB;AACpE,aAAK,WAAW;AAChB,aAAK,SAAS;AACd,aAAK,QAAQ,cAAc,MAAO,KAAK,KAAc,QAAQ;AAAA,MAC/D,OAAO;AACL,aAAK,OAAO,KAAK,UAAU,KAAK,IAAI;AACpC,aAAK,QAAQ,cAAc,MAAM;AAAA,MACnC;AAEF,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,QAAQ,MAAc,MAAyC;AAC3E,UAAM,MAAM,IAAI,IAAI,MAAM,KAAK,MAAM;AACrC,UAAM,WAAW,MAAM,KAAK,MAAM,IAAI,MAAM,IAAI;AAEhD,UAAM,YAAY,SAAS,QAAQ,IAAI,eAAe;AAEtD,QAAI,cAAc,MAAM;AACtB,WAAK,YAAY;AACjB,WAAK,OAAO,KAAK,aAAa,SAAS;AAAA,IACzC;AAEA,WAAO;AAAA,EACT;AACF;;;AClIA,IAAM,WAAN,MAAmE;AAAA,EAChD;AAAA,EACA;AAAA,EACA;AAAA,EAEV,YAAY,SAAkB;AACnC,SAAK,QAAQ,QAAQ;AACrB,SAAK,OAAO,QAAQ;AACpB,SAAK,OAAO,QAAQ;AAAA,EACtB;AAAA,EAIA,MAAa,KAA6B,WAAqC,MAAuC;AACpH,UAAM,MAAM,OAAO,cAAc,WAAW,YAAY;AAExD,WAAO,OAAO,cAAc,WAAW,OAAO;AAE9C,UAAM,MAAM,KAAK,IAAI,GAAG;AACxB,UAAM,UAAU,OAAO,OAAO,CAAC,GAAG,KAAK,MAAM,IAAI;AAEjD,WAAO,MAAM,KAAK,MAAM,KAAW,KAAK,OAAO;AAAA,EACjD;AAAA,EAIA,MAAa,OAAqF,WAAqC,MAAuE;AAC5M,UAAM,MAAM,OAAO,cAAc,WAAW,YAAY;AAExD,WAAO,OAAO,cAAc,WAAW,OAAO;AAE9C,UAAM,MAAM,KAAK,IAAI,GAAG;AACxB,UAAM,UAAU,OAAO,OAAO,CAAC,GAAG,KAAK,MAAM,IAAI;AAEjD,WAAO,MAAM,KAAK,MAAM,OAAa,KAAK,OAAO;AAAA,EACnD;AAAA,EAEQ,IAAI,KAAqB;AAC/B,UAAM,OAAO,IAAI,IAAI,KAAK,MAAM,YAAY;AAC5C,UAAM,MAAM,IAAI,IAAI,KAAK,IAAI;AAG7B,QAAI,CAAC,IAAI,SAAS,SAAS,GAAG;AAC5B,UAAI,YAAY;AAElB,WAAO,IAAI,WAAW,IAAI;AAAA,EAC5B;AACF;;;AF5CA,IAAM,SAAN,MAAa;AAAA,EACK;AAAA,EACC;AAAA,EAEjB,YAAY,SAAkB;AAC5B,SAAK,aAAS,aAAAC,SAAa;AAE3B,SAAK,QAAQ,IAAI,MAAM;AAAA,MACrB,QAAQ,QAAQ;AAAA,MAChB,QAAQ,KAAK;AAAA,IACf,CAAC;AAAA,EACH;AAAA,EAEO,SAAsB,MAAc,MAAgC;AACzE,WAAO,IAAI,SAAY;AAAA,MACrB,OAAO,KAAK;AAAA,MACZ;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEO,aAAa,WAA0B;AAC5C,SAAK,MAAM,aAAa,SAAS;AAAA,EACnC;AAAA,EAEO,IAAIC,QAAc;AACvB,SAAK,MAAM,IAAIA,MAAK;AAAA,EACtB;AACF;AAEA,SAAS,QAAQ,SAA2B;AAC1C,MAAI,OAAO,YAAY;AACrB,cAAU,EAAE,QAAQ,QAAQ;AAE9B,SAAO,IAAI,OAAO,OAAO;AAC3B;;;AG3CA;AAAA;AAAA;AAAA;AAAA;AAQO,SAAS,KAAK,OAAwB;AAC3C,SAAO,2BAA2B,KAAK,KAAK;AAC9C;AAEO,SAAS,OAAO,MAAc,OAAyB;AAC5D,QAAM,CAAC,KAAK,GAAG,IAAI,MAAM,MAAM,GAAG,EAAE,EAAE,MAAM,IAAI;AAEhD,SAAO;AAAA,IACL,GAAG,IAAI,GAAG,MAAM,WAAW,GAAG,IAAI,MAAM,IAAI,GAAG,GAAG;AAAA,IAClD,GAAG,IAAI,GAAG,MAAM,SAAS,GAAG,IAAI,MAAM,IAAI,GAAG,GAAG;AAAA,EAClD;AACF;;;AChBA,IAAM,UAAoB,CAAC,aAAK;;;ACDhC,SAAS,MAAM,QAA0B,SAA2B;AAClE,MAAI,WAAW,OAAW,QAAO;AAEjC,QAAM,QAAkB,CAAC;AACzB,QAAM,WAAqB,CAAC;AAE5B,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,GAAG;AAC3C,UAAM,OAAO,SAAS,MAAM,GAAG,KAAK;AAEpC,QAAI,SAAS,SAAS,IAAI,KAAK,SAAS,UAAU,SAAS,IAAI,MAAM;AACnE,YAAM,KAAK,GAAG,IAAI,IAAI,KAAK,EAAE;AAAA,SAC1B;AACH,YAAMC,UAAS,QAAQ,KAAK,CAACA,YAAWA,QAAO,KAAK,KAAK,CAAC;AAE1D,UAAIA,YAAW;AACb,iBAAS,KAAK,GAAG,IAAI,KAAK,KAAK,EAAE;AAAA;AAEjC,iBAAS,KAAK,GAAGA,QAAO,OAAO,MAAM,KAAK,CAAC;AAAA,IAC/C;AAAA,EACF;AAEA,MAAI,SAAS,SAAS;AACpB,UAAM,QAAQ,YAAY,SAAS,KAAK,GAAG,CAAC,EAAE;AAEhD,SAAO,MAAM,WAAW,IACpB,KACA,MAAM,MAAM,KAAK,GAAG;AAC1B;AAEA,IAAM,WAAqB,CAAC,QAAQ,SAAS,QAAQ;","names":["import_mitt","mitt","fetch","mitt","fetch","format"]}

package/dist/index.d.cts

@@ -52,8 +52,10 @@ declare class Resource<T = unknown, E extends GenericError = GenericError> {
     private readonly path;
     private readonly init?;
     constructor(options: Options$2);
-    json<R = T, F extends E = E>(rel?: string, init?: RequestOptions): Promise<R | F>;
-    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel?: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
+    json<R = T, F extends E = E>(init?: RequestOptions): Promise<R | F>;
+    json<R = T, F extends E = E>(rel: string, init?: RequestOptions): Promise<R | F>;
+    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
+    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
     private abs;
 }
 interface Options$2 {
@@ -71,7 +73,7 @@ declare class Origin {
     authenticate(challenge: string | null): void;
     use(fetch: Fetch): void;
 }
-declare function connect(options: Options$1): Origin;
+declare function connect(options: Options$1 | string): Origin;
 interface Options$1 {
     origin: string;
 }

package/dist/index.d.ts

@@ -52,8 +52,10 @@ declare class Resource<T = unknown, E extends GenericError = GenericError> {
     private readonly path;
     private readonly init?;
     constructor(options: Options$2);
-    json<R = T, F extends E = E>(rel?: string, init?: RequestOptions): Promise<R | F>;
-    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel?: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
+    json<R = T, F extends E = E>(init?: RequestOptions): Promise<R | F>;
+    json<R = T, F extends E = E>(rel: string, init?: RequestOptions): Promise<R | F>;
+    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
+    octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(rel: string, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>;
     private abs;
 }
 interface Options$2 {
@@ -71,7 +73,7 @@ declare class Origin {
     authenticate(challenge: string | null): void;
     use(fetch: Fetch): void;
 }
-declare function connect(options: Options$1): Origin;
+declare function connect(options: Options$1 | string): Origin;
 interface Options$1 {
     origin: string;
 }

package/dist/index.js

@@ -111,12 +111,16 @@ var Resource = class {
     this.path = options.path;
     this.init = options.init;
   }
-  async json(rel = "", init) {
+  async json(relOrInit, init) {
+    const rel = typeof relOrInit === "string" ? relOrInit : "";
+    init = typeof relOrInit === "string" ? init : relOrInit;
     const abs = this.abs(rel);
     const options = Object.assign({}, this.init, init);
     return await this.agent.json(abs, options);
   }
-  async octets(rel = "", init) {
+  async octets(relOrInit, init) {
+    const rel = typeof relOrInit === "string" ? relOrInit : "";
+    init = typeof relOrInit === "string" ? init : relOrInit;
     const abs = this.abs(rel);
     const options = Object.assign({}, this.init, init);
     return await this.agent.octets(abs, options);
@@ -124,6 +128,8 @@ var Resource = class {
   abs(rel) {
     const base = new URL(this.path, "uri://void");
     const url = new URL(rel, base);
+    if (!url.pathname.endsWith("/"))
+      url.pathname += "/";
     return url.pathname + url.search;
   }
 };
@@ -154,6 +160,8 @@ var Origin = class {
   }
 };
 function connect(options) {
+  if (typeof options === "string")
+    options = { origin: options };
   return new Origin(options);
 }
 

package/dist/index.js.map

@@ -1 +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":";;;;;;;AAAA,OAAOA,WAAU;;;ACAjB,SAAS,WAAW;AACpB,SAAS,aAAa;AACtB,OAAO,UAAU;AAMjB,IAAM,QAAN,MAAY;AAAA,EACO;AAAA,EACA;AAAA,EACT,QAAe;AAAA,EAEf,YAA2B;AAAA,EAEnC,YAAY,SAAkB;AAC5B,SAAK,SAAS,QAAQ;AACtB,SAAK,SAAS,QAAQ;AAAA,EACxB;AAAA,EAEA,MAAa,KAA+C,MAAc,MAAuC;AAC/G,UAAM,UAAU,KAAK,MAAM,IAAI;AAC/B,UAAM,WAAW,MAAM,KAAK,QAAQ,MAAM,OAAO;AAEjD,UAAM,OAAO,SAAS,QAAQ,IAAI,cAAc,MAAM,qBAClD,MAAM,SAAS,KAAK,IACpB,MAAM,SAAS,KAAK;AAExB,QAAI,SAAS;AACX,aAAO;AAAA,SACJ;AACH,WAAK,OAAO,KAAK,SAAS,EAAE,MAAM,SAAS,QAAQ,KAAK,CAAC;AAEzD,aAAO,IAAI,IAAI,SAAS,QAAQ,IAAI;AAAA,IACtC;AAAA,EACF;AAAA,EAEA,MAAa,UAAuB,MAAc,MAAmF;AACnI,UAAM,UAAU,KAAK,MAAM,IAAI;AAC/B,UAAM,WAAW,MAAM,KAAK,QAAQ,MAAM,OAAO;AAEjD,QAAI,CAAC,SAAS;AACZ,aAAO,IAAI,IAAI,SAAS,QAAQ,MAAM,SAAS,KAAK,CAAC;AAEvD,UAAM,YAAY,MAAM,MAAM,QAAQ;AACtC,UAAM,MAAM,MAAM,UAAU,KAAK;AAEjC,QAAI,KAAK,MAAM,IAAI,MAAM,IAAI,MAAM,MAAO,OAAM,IAAI,MAAM,QAAQ;AAElE,YAAQ,mBAAoB;AAC1B,uBAAiB,SAAS,WAAW;AACnC,cAAM,QAAQ,KAAK,MAAM,MAAM,IAAI;AAEnC,YAAI,UAAU,MAAO;AAErB,cAAM;AAAA,MACR;AAAA,IACF,GAAG;AAAA,EACL;AAAA,EAEA,MAAa,OAGX,MAAc,MAAuE;AACrF,UAAM,YAAY,MAAM,KAAK,UAAsC,MAAM,IAAI;AAE7E,QAAI,qBAAqB,MAAO,QAAO;AAEvC,UAAM,QAAQ,MAAM,UAAU,KAAK;AACnC,UAAM,QAAQ,MAAM;AACpB,UAAM,UAAU,KAAgB;AAEhC,UAAM,YAAY;AAChB,uBAAiB,QAAS,WAA4C;AACpE,cAAM,UACJ,KAAK,WAAW,cACZ,KAAK,SACL,IAAI,IAAI,KAAK,OAAO,QAAQ,WAAW,KAAK,OAAO,OAAO;AAEhE,gBAAQ,KAAK,KAAK,MAAM,OAA8B;AAAA,MACxD;AAEA,cAAQ,IAAI,GAAG;AAAA,IACjB,GAAG;AAEH,WAAO,CAAC,OAAO,OAAO;AAAA,EACxB;AAAA,EAEO,aAAa,WAA0B;AAC5C,SAAK,YAAY;AAAA,EACnB;AAAA,EAEO,IAAIC,QAAc;AACvB,SAAK,QAAQA;AAAA,EACf;AAAA,EAEQ,MAAM,MAAwC;AACpD,aAAS,CAAC;AACV,SAAK,YAAY,CAAC;AAClB,SAAK,QAAQ,QAAQ,MAAM;AAE3B,QAAI,KAAK,gBAAgB,aAAa,KAAK,QAAQ,eAAe,MAAM,QAAW;AACjF,UAAI,KAAK,cAAc;AACrB,cAAM,IAAI,MAAM,8DAA8D;AAEhF,WAAK,QAAQ,eAAe,IAAI,KAAK;AACrC,aAAO,KAAK;AAAA,IACd;AAEA,QAAI,KAAK,SAAS;AAChB,UAAI,KAAK,gBAAgB,QAAQ,KAAK,gBAAgB,gBAAgB;AACpE,aAAK,WAAW;AAChB,aAAK,SAAS;AACd,aAAK,QAAQ,cAAc,MAAO,KAAK,KAAc,QAAQ;AAAA,MAC/D,OAAO;AACL,aAAK,OAAO,KAAK,UAAU,KAAK,IAAI;AACpC,aAAK,QAAQ,cAAc,MAAM;AAAA,MACnC;AAEF,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,QAAQ,MAAc,MAAyC;AAC3E,UAAM,MAAM,IAAI,IAAI,MAAM,KAAK,MAAM;AACrC,UAAM,WAAW,MAAM,KAAK,MAAM,IAAI,MAAM,IAAI;AAEhD,UAAM,YAAY,SAAS,QAAQ,IAAI,eAAe;AAEtD,QAAI,cAAc,MAAM;AACtB,WAAK,YAAY;AACjB,WAAK,OAAO,KAAK,aAAa,SAAS;AAAA,IACzC;AAEA,WAAO;AAAA,EACT;AACF;;;AClIA,IAAM,WAAN,MAAmE;AAAA,EAChD;AAAA,EACA;AAAA,EACA;AAAA,EAEV,YAAY,SAAkB;AACnC,SAAK,QAAQ,QAAQ;AACrB,SAAK,OAAO,QAAQ;AACpB,SAAK,OAAO,QAAQ;AAAA,EACtB;AAAA,EAEA,MAAa,KAA6B,MAAc,IAAI,MAAuC;AACjG,UAAM,MAAM,KAAK,IAAI,GAAG;AACxB,UAAM,UAAU,OAAO,OAAO,CAAC,GAAG,KAAK,MAAM,IAAI;AAEjD,WAAO,MAAM,KAAK,MAAM,KAAW,KAAK,OAAO;AAAA,EACjD;AAAA,EAEA,MAAa,OAAqF,MAAc,IAAI,MAAuE;AACzL,UAAM,MAAM,KAAK,IAAI,GAAG;AACxB,UAAM,UAAU,OAAO,OAAO,CAAC,GAAG,KAAK,MAAM,IAAI;AAEjD,WAAO,MAAM,KAAK,MAAM,OAAa,KAAK,OAAO;AAAA,EACnD;AAAA,EAEQ,IAAI,KAAqB;AAC/B,UAAM,OAAO,IAAI,IAAI,KAAK,MAAM,YAAY;AAC5C,UAAM,MAAM,IAAI,IAAI,KAAK,IAAI;AAE7B,WAAO,IAAI,WAAW,IAAI;AAAA,EAC5B;AACF;;;AF5BA,IAAM,SAAN,MAAa;AAAA,EACK;AAAA,EACC;AAAA,EAEjB,YAAY,SAAkB;AAC5B,SAAK,SAASC,MAAa;AAE3B,SAAK,QAAQ,IAAI,MAAM;AAAA,MACrB,QAAQ,QAAQ;AAAA,MAChB,QAAQ,KAAK;AAAA,IACf,CAAC;AAAA,EACH;AAAA,EAEO,SAAsB,MAAc,MAAgC;AACzE,WAAO,IAAI,SAAY;AAAA,MACrB,OAAO,KAAK;AAAA,MACZ;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEO,aAAa,WAA0B;AAC5C,SAAK,MAAM,aAAa,SAAS;AAAA,EACnC;AAAA,EAEO,IAAIC,QAAc;AACvB,SAAK,MAAM,IAAIA,MAAK;AAAA,EACtB;AACF;AAEA,SAAS,QAAQ,SAAkB;AACjC,SAAO,IAAI,OAAO,OAAO;AAC3B;;;AGxCA;AAAA;AAAA;AAAA;AAAA;AAQO,SAAS,KAAK,OAAwB;AAC3C,SAAO,2BAA2B,KAAK,KAAK;AAC9C;AAEO,SAAS,OAAO,MAAc,OAAyB;AAC5D,QAAM,CAAC,KAAK,GAAG,IAAI,MAAM,MAAM,GAAG,EAAE,EAAE,MAAM,IAAI;AAEhD,SAAO;AAAA,IACL,GAAG,IAAI,GAAG,MAAM,WAAW,GAAG,IAAI,MAAM,IAAI,GAAG,GAAG;AAAA,IAClD,GAAG,IAAI,GAAG,MAAM,SAAS,GAAG,IAAI,MAAM,IAAI,GAAG,GAAG;AAAA,EAClD;AACF;;;AChBA,IAAM,UAAoB,CAAC,aAAK;;;ACDhC,SAAS,MAAM,QAA0B,SAA2B;AAClE,MAAI,WAAW,OAAW,QAAO;AAEjC,QAAM,QAAkB,CAAC;AACzB,QAAM,WAAqB,CAAC;AAE5B,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,GAAG;AAC3C,UAAM,OAAO,SAAS,MAAM,GAAG,KAAK;AAEpC,QAAI,SAAS,SAAS,IAAI,KAAK,SAAS,UAAU,SAAS,IAAI,MAAM;AACnE,YAAM,KAAK,GAAG,IAAI,IAAI,KAAK,EAAE;AAAA,SAC1B;AACH,YAAMC,UAAS,QAAQ,KAAK,CAACA,YAAWA,QAAO,KAAK,KAAK,CAAC;AAE1D,UAAIA,YAAW;AACb,iBAAS,KAAK,GAAG,IAAI,KAAK,KAAK,EAAE;AAAA;AAEjC,iBAAS,KAAK,GAAGA,QAAO,OAAO,MAAM,KAAK,CAAC;AAAA,IAC/C;AAAA,EACF;AAEA,MAAI,SAAS,SAAS;AACpB,UAAM,QAAQ,YAAY,SAAS,KAAK,GAAG,CAAC,EAAE;AAEhD,SAAO,MAAM,WAAW,IACpB,KACA,MAAM,MAAM,KAAK,GAAG;AAC1B;AAEA,IAAM,WAAqB,CAAC,QAAQ,SAAS,QAAQ;","names":["mitt","fetch","mitt","fetch","format"]}
+{"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 | string) {\n  if (typeof options === 'string')\n    options = { origin: options }\n\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>(init?: RequestOptions): Promise<R | F>\n  public async json<R = T, F extends E = E>(rel: string, init?: RequestOptions): Promise<R | F>\n  public async json<R = T, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<R | F> {\n    const rel = typeof relOrInit === 'string' ? relOrInit : ''\n\n    init = typeof relOrInit === 'string' ? init : relOrInit\n\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>(init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>\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  public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {\n    const rel = typeof relOrInit === 'string' ? relOrInit : ''\n\n    init = typeof relOrInit === 'string' ? init : relOrInit\n\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    // Allows to use resource.json(id) instead of resource.json(id + '/')\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","/**\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

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/origin",
-  "version": "1.7.0",
+  "version": "1.10.0",
   "publishConfig": {
     "access": "public"
   },

package/source/Origin.ts

@@ -36,7 +36,10 @@ class Origin {
   }
 }
 
-function connect(options: Options) {
+function connect(options: Options | string) {
+  if (typeof options === 'string')
+    options = { origin: options }
+
   return new Origin(options)
 }
 

package/source/Resource.ts

@@ -14,14 +14,26 @@ class Resource<T = unknown, E extends GenericError = GenericError> {
     this.init = options.init
   }
 
-  public async json<R = T, F extends E = E>(rel: string = '', init?: RequestOptions): Promise<R | F> {
+  public async json<R = T, F extends E = E>(init?: RequestOptions): Promise<R | F>
+  public async json<R = T, F extends E = E>(rel: string, init?: RequestOptions): Promise<R | F>
+  public async json<R = T, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<R | F> {
+    const rel = typeof relOrInit === 'string' ? relOrInit : ''
+
+    init = typeof relOrInit === 'string' ? init : relOrInit
+
     const abs = this.abs(rel)
     const options = Object.assign({}, this.init, init)
 
     return await this.agent.json<R, F>(abs, options)
   }
 
-  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> {
+  public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F>
+  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>
+  public async octets<T extends Record<string, unknown> = Record<string, unknown>, F extends E = E>(relOrInit?: string | RequestOptions, init?: RequestOptions): Promise<[OctetsEntry, Emitter<Faulty<T>>] | F> {
+    const rel = typeof relOrInit === 'string' ? relOrInit : ''
+
+    init = typeof relOrInit === 'string' ? init : relOrInit
+
     const abs = this.abs(rel)
     const options = Object.assign({}, this.init, init)
 
@@ -32,6 +44,10 @@ class Resource<T = unknown, E extends GenericError = GenericError> {
     const base = new URL(this.path, 'uri://void')
     const url = new URL(rel, base)
 
+    // Allows to use resource.json(id) instead of resource.json(id + '/')
+    if (!url.pathname.endsWith('/'))
+      url.pathname += '/'
+
     return url.pathname + url.search
   }
 }