@thisisagile/easy 17.19.0 → 17.20.1

package/dist/index.mjs

@@ -111,8 +111,4 @@ export * from "./utils/Wait";
 export * from "./validation/Contraints";
 export * from "./validation/Validate";
 export * from "./validation/When";
-import { IdName } from "./types/IdName";
-export {
-  IdName
-};
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './data/Condition';\nexport * from './data/InMemoryGateway';\nexport * from './data/Database';\nexport * from './data/DataProvider';\nexport * from './data/Field';\nexport * from './data/Query';\nexport * from './data/QueryProvider';\n\nexport * from './domain/Audit';\nexport * from './domain/Child';\nexport * from './domain/DateTime';\nexport * from './domain/Entity';\nexport * from './domain/Struct';\nexport * from './domain/Repo';\nexport * from './domain/Typo';\n\nexport * from './http/CacheControl';\nexport * from './http/ContentType';\nexport * from './http/HttpHeader';\nexport * from './http/HttpStatus';\nexport * from './http/HttpVerb';\nexport * from './http/Request';\nexport * from './http/RequestOptions';\nexport * from './http/RequestProvider';\nexport * from './http/Response';\nexport * from './http/RestResult';\nexport * from './http/toResponse';\n\nexport * from './process/App';\nexport * from './process/Manage';\nexport * from './process/Scope';\nexport * from './process/Search';\nexport * from './process/UseCase';\n\nexport * from './resources/Req';\n\nexport * from './security/Jwt';\n\nexport * from './services/Api';\nexport * from './services/ApiGateway';\nexport * from './services/AxiosProvider';\nexport * from './services/MappedRouteGateway';\nexport * from './services/RouteGateway';\nexport * from './services/ViewRouteGateway';\n\nexport * from './sql/Clause';\nexport * from './sql/Column';\nexport * from './sql/Delete';\nexport * from './sql/Insert';\nexport * from './sql/Join';\nexport * from './sql/SqlQuery';\nexport * from './sql/Select';\nexport * from './sql/Table';\nexport * from './sql/TableGateway';\nexport * from './sql/Update';\n\nexport * from './types/AnyKey';\nexport * from './types/Array';\nexport * from './types/Builder';\nexport * from './types/Cache';\nexport * from './types/CacheAge';\nexport * from './types/Case';\nexport * from './types/Constructor';\nexport * from './types/Context';\nexport * from './types/Currency';\nexport * from './types/Enum';\nexport * from './types/Environment';\nexport * from './types/ErrorOrigin';\nexport * from './types/Exception';\nexport * from './types/Falsy';\nexport * from './types/Func';\nexport * from './types/Gateway';\nexport * from './types/Get';\nexport * from './types/Id';\nexport * from './types/Identity';\nexport * from './types/IdName';\nexport * from './types/Is';\nexport * from './types/IsA';\nexport * from './types/IsDate';\nexport * from './types/IsEqual';\nexport * from './types/Json';\nexport * from './types/List';\nexport * from './types/Message';\nexport * from './types/Meta';\nexport * from './types/Nullish';\nexport * from './types/Number';\nexport * from './types/Object';\nexport * from './types/PageList';\nexport * from './types/Parser';\nexport * from './types/Primitive';\nexport * from './types/Repository';\nexport * from './types/Result';\nexport * from './types/Results';\nexport * from './types/Sort';\nexport * from './types/Tag';\nexport * from './types/Template';\nexport * from './types/Text';\nexport * from './types/Try';\nexport * from './types/TypeGuard';\nexport * from './types/Types';\nexport * from './types/Uri';\nexport * from './types/Uuid';\nexport * from './types/Validatable';\nexport * from './types/Value';\n\nexport * from './utils/Base64';\nexport * from './utils/Convert';\nexport * from './utils/If';\nexport * from './utils/Loading';\nexport * from './utils/Log';\nexport * from './utils/Mapper';\nexport * from './utils/Promise';\nexport * from './utils/Property';\nexport * from './utils/Seconds';\nexport * from './utils/State';\nexport * from './utils/Sentence';\nexport * from './utils/Traverse';\nexport * from './utils/View';\nexport * from './utils/Wait';\n\nexport * from './validation/Contraints';\nexport * from './validation/Validate';\nexport * from './validation/When';\nexport { IdName } from './types/IdName';\n"],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAAS,cAAc;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './data/Condition';\nexport * from './data/InMemoryGateway';\nexport * from './data/Database';\nexport * from './data/DataProvider';\nexport * from './data/Field';\nexport * from './data/Query';\nexport * from './data/QueryProvider';\n\nexport * from './domain/Audit';\nexport * from './domain/Child';\nexport * from './domain/DateTime';\nexport * from './domain/Entity';\nexport * from './domain/Struct';\nexport * from './domain/Repo';\nexport * from './domain/Typo';\n\nexport * from './http/CacheControl';\nexport * from './http/ContentType';\nexport * from './http/HttpHeader';\nexport * from './http/HttpStatus';\nexport * from './http/HttpVerb';\nexport * from './http/Request';\nexport * from './http/RequestOptions';\nexport * from './http/RequestProvider';\nexport * from './http/Response';\nexport * from './http/RestResult';\nexport * from './http/toResponse';\n\nexport * from './process/App';\nexport * from './process/Manage';\nexport * from './process/Scope';\nexport * from './process/Search';\nexport * from './process/UseCase';\n\nexport * from './resources/Req';\n\nexport * from './security/Jwt';\n\nexport * from './services/Api';\nexport * from './services/ApiGateway';\nexport * from './services/AxiosProvider';\nexport * from './services/MappedRouteGateway';\nexport * from './services/RouteGateway';\nexport * from './services/ViewRouteGateway';\n\nexport * from './sql/Clause';\nexport * from './sql/Column';\nexport * from './sql/Delete';\nexport * from './sql/Insert';\nexport * from './sql/Join';\nexport * from './sql/SqlQuery';\nexport * from './sql/Select';\nexport * from './sql/Table';\nexport * from './sql/TableGateway';\nexport * from './sql/Update';\n\nexport * from './types/AnyKey';\nexport * from './types/Array';\nexport * from './types/Builder';\nexport * from './types/Cache';\nexport * from './types/CacheAge';\nexport * from './types/Case';\nexport * from './types/Constructor';\nexport * from './types/Context';\nexport * from './types/Currency';\nexport * from './types/Enum';\nexport * from './types/Environment';\nexport * from './types/ErrorOrigin';\nexport * from './types/Exception';\nexport * from './types/Falsy';\nexport * from './types/Func';\nexport * from './types/Gateway';\nexport * from './types/Get';\nexport * from './types/Id';\nexport * from './types/Identity';\nexport * from './types/IdName';\nexport * from './types/Is';\nexport * from './types/IsA';\nexport * from './types/IsDate';\nexport * from './types/IsEqual';\nexport * from './types/Json';\nexport * from './types/List';\nexport * from './types/Message';\nexport * from './types/Meta';\nexport * from './types/Nullish';\nexport * from './types/Number';\nexport * from './types/Object';\nexport * from './types/PageList';\nexport * from './types/Parser';\nexport * from './types/Primitive';\nexport * from './types/Repository';\nexport * from './types/Result';\nexport * from './types/Results';\nexport * from './types/Sort';\nexport * from './types/Tag';\nexport * from './types/Template';\nexport * from './types/Text';\nexport * from './types/Try';\nexport * from './types/TypeGuard';\nexport * from './types/Types';\nexport * from './types/Uri';\nexport * from './types/Uuid';\nexport * from './types/Validatable';\nexport * from './types/Value';\n\nexport * from './utils/Base64';\nexport * from './utils/Convert';\nexport * from './utils/If';\nexport * from './utils/Loading';\nexport * from './utils/Log';\nexport * from './utils/Mapper';\nexport * from './utils/Promise';\nexport * from './utils/Property';\nexport * from './utils/Seconds';\nexport * from './utils/State';\nexport * from './utils/Sentence';\nexport * from './utils/Traverse';\nexport * from './utils/View';\nexport * from './utils/Wait';\n\nexport * from './validation/Contraints';\nexport * from './validation/Validate';\nexport * from './validation/When';\n"],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}

package/dist/services/MappedRouteGateway.mjs

@@ -4,7 +4,7 @@ import {
 import "../chunk-WJZFE5NE.mjs";
 import {
   RouteGateway
-} from "../chunk-3XD77BIN.mjs";
+} from "../chunk-S5I6XCJK.mjs";
 import "../chunk-3MDXTFJG.mjs";
 import {
   Api

package/dist/services/RouteGateway.d.ts

@@ -1,25 +1,25 @@
-import { Api, RouteOptions } from './Api';
+import { Api } from './Api';
 import { ApiGateway } from './ApiGateway';
 import { Func } from '../types/Func';
-import { Uri } from '../types/Uri';
+import { Uri, UriExpandProps } from '../types/Uri';
 import { PageList } from '../types/PageList';
 import { Json, JsonValue } from '../types/Json';
 import { Id } from '../types/Id';
 import { Optional } from '../types/Types';
 import { List } from '../types/List';
-export declare class RouteGateway extends ApiGateway {
-    readonly route: Func<Uri>;
-    readonly routeId: Func<Uri>;
+export declare class RouteGateway<Props extends UriExpandProps = UriExpandProps> extends ApiGateway {
+    readonly route: Func<Uri<Props>>;
+    readonly routeId: Func<Uri<Props>>;
     readonly api: Api;
-    constructor(route: Func<Uri>, routeId: Func<Uri>, api?: Api);
-    all(options?: RouteOptions): Promise<PageList<Json>>;
-    byId(id: Id, options?: RouteOptions): Promise<Optional<Json>>;
+    constructor(route: Func<Uri<Props>>, routeId: Func<Uri<Props>>, api?: Api);
+    all(options?: Props): Promise<PageList<Json>>;
+    byId(id: Id): Promise<Optional<Json>>;
     byIds(...ids: Id[]): Promise<List<Json>>;
-    search(q: JsonValue, options?: RouteOptions): Promise<PageList<Json>>;
-    exists(id: Id, options?: RouteOptions): Promise<boolean>;
-    add(item: Json, options?: RouteOptions): Promise<Json>;
-    filter(options?: RouteOptions): Promise<PageList<Json>>;
-    update(item: Json, options?: RouteOptions): Promise<Json>;
-    upsert(item: Json, options?: RouteOptions): Promise<Json>;
-    remove(id: Id, options?: RouteOptions): Promise<boolean>;
+    search(q: JsonValue, options?: Props): Promise<PageList<Json>>;
+    exists(id: Id): Promise<boolean>;
+    add(item: Json): Promise<Json>;
+    filter(options?: Props): Promise<PageList<Json>>;
+    update(item: Json): Promise<Json>;
+    upsert(item: Json): Promise<Json>;
+    remove(id: Id): Promise<boolean>;
 }

package/dist/services/RouteGateway.mjs

@@ -1,6 +1,6 @@
 import {
   RouteGateway
-} from "../chunk-3XD77BIN.mjs";
+} from "../chunk-S5I6XCJK.mjs";
 import "../chunk-3MDXTFJG.mjs";
 import "../chunk-RTTVCEWR.mjs";
 import "../chunk-XH47BBYI.mjs";

package/dist/services/ViewRouteGateway.mjs

@@ -5,7 +5,7 @@ import "../chunk-PVWD7L7K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import {
   RouteGateway
-} from "../chunk-3XD77BIN.mjs";
+} from "../chunk-S5I6XCJK.mjs";
 import "../chunk-3MDXTFJG.mjs";
 import {
   Api

package/dist/types/Repository.d.ts

@@ -12,8 +12,8 @@ export declare class Repository<T, Options = FetchOptions> {
     search(q: JsonValue, options?: Options): Promise<PageList<T>>;
     filter(options?: Options): Promise<PageList<T>>;
     exists(id: Id): Promise<boolean>;
-    add(t: T | Json): Promise<T>;
-    update(id: Id, json: Json): Promise<T>;
+    add(t: Partial<T> | Json): Promise<T>;
+    update(id: Id, json: Partial<T> | Json): Promise<T>;
     remove(id: Id): Promise<boolean>;
-    upsert(id: Id, item: Json): Promise<T>;
+    upsert(id: Id, item: Partial<T> | Json): Promise<T>;
 }

package/dist/types/Repository.mjs

@@ -1,6 +1,6 @@
 import {
   Repository
-} from "../chunk-ZEZBMEWP.mjs";
+} from "../chunk-WVYZIPWC.mjs";
 import "../chunk-KXOBVHGI.mjs";
 import "../chunk-PKILDKWU.mjs";
 import "../chunk-3Y7X2UQ6.mjs";

package/dist/types/Uri.d.ts

@@ -13,7 +13,7 @@ export declare const toSegment: (key?: Text, { segment, query, }?: {
 }) => Segment;
 export declare const uri: {
     host: (key?: string) => Segment;
-    resource: (resource: Uri) => Segment;
+    resource: <Props extends UriExpandProps>(resource: Uri<Props>) => Segment;
     segment: (key?: Text) => Segment;
     path: (key: Text) => Segment;
     query: (key: Text) => Segment;
@@ -23,23 +23,26 @@ type Prop = {
     segment: Segment;
     value: any;
 };
-export type Uri = {
-    id: (id?: unknown) => Uri;
-    ids: (ids: OneOrMore<unknown>) => Uri;
-    query: (q?: unknown) => Uri;
-    sort: (q?: any) => Uri;
-    skip: (n?: number) => Uri;
-    take: (n?: number) => Uri;
+export type Uri<Props extends UriExpandProps = UriExpandProps> = {
+    id: (id?: unknown) => Uri<Props>;
+    ids: (ids: OneOrMore<unknown>) => Uri<Props>;
+    query: (q?: unknown) => Uri<Props>;
+    sort: (q?: any) => Uri<Props>;
+    skip: (n?: number) => Uri<Props>;
+    take: (n?: number) => Uri<Props>;
     path: string;
     route: (resource: string) => string;
     isInternal: boolean;
     toString: () => string;
+    expand: (props: Partial<Props>) => Uri<Props>;
 };
 export type UriExpandProps = {
-    q: string;
-    s: string;
+    q?: string;
+    s?: string;
+    skip?: number;
+    take?: number;
 };
-export declare class EasyUri<Props = UriExpandProps> implements Uri {
+export declare class EasyUri<Props extends UriExpandProps = UriExpandProps> implements Uri<Props> {
     readonly segments: Segment[];
     static readonly id: Segment;
     static readonly ids: Segment;

package/dist/types/Uri.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/Uri.ts"],"sourcesContent":["import { isBoolean, isNotEmpty, isTrue } from './Is';\nimport { asString, Text } from './Text';\nimport { toName } from './Constructor';\nimport { ctx } from './Context';\nimport { List, toList } from './List';\nimport { meta } from './Meta';\nimport { tryTo } from './Try';\nimport { Optional } from './Types';\nimport { OneOrMore, toArray } from './Array';\nimport { entries } from './Object';\n\nexport type Segment = Text & { key?: string; segment?: string; query?: (value: unknown) => string };\n\nexport const toSegment = (\n  key?: Text,\n  {\n    segment,\n    query,\n  }: {\n    segment?: string;\n    query?: (value: unknown) => string;\n  } = {}\n): Segment => ({\n  key: key as string,\n  segment,\n  query,\n  toString: () => asString(key),\n});\n\nexport const uri = {\n  host: (key?: string): Segment => toSegment(key, { segment: key ?? ctx.env.host ?? '$host' }),\n  resource: (resource: Uri): Segment => toSegment(toName(resource, 'Uri'), { segment: toName(resource, 'Uri') }),\n  segment: (key?: Text): Segment => toSegment(key, { segment: key as string }),\n  path: (key: Text): Segment => toSegment(key, { segment: `:${key}` }),\n  query: (key: Text): Segment =>\n    toSegment(key, {\n      query: (value: unknown): string =>\n        tryTo(value)\n          .is.defined()\n          .map(v => encodeURIComponent(asString(v)))\n          .map(v => `${key}=${v}`)\n          .orElse('') ?? '',\n    }),\n  boolean: (key: Text): Segment => toSegment(key, { query: (value: unknown): string => (isTrue(value) ? `${key}` : '') }),\n};\n\ntype Prop = { segment: Segment; value: any };\n\nconst toRoute = (...segments: Segment[]): string =>\n  toList(segments)\n    .mapDefined(s => s.segment)\n    .join('/');\n\nexport type Uri = {\n  id: (id?: unknown) => Uri;\n  ids: (ids: OneOrMore<unknown>) => Uri;\n  query: (q?: unknown) => Uri;\n  sort: (q?: any) => Uri;\n  skip: (n?: number) => Uri;\n  take: (n?: number) => Uri;\n  path: string;\n  route: (resource: string) => string;\n  isInternal: boolean;\n  toString: () => string;\n};\n\nexport type UriExpandProps = { q: string; s: string };\n\nexport class EasyUri<Props = UriExpandProps> implements Uri {\n  static readonly id = uri.path('id');\n  static readonly ids = uri.query('ids');\n  static readonly query = uri.query('q');\n  static readonly sort = uri.query('s');\n  static readonly skip = uri.query('skip');\n  static readonly take = uri.query('take');\n\n  readonly host = uri.host();\n  protected resource = uri.resource(this);\n\n  protected state: any = {};\n\n  constructor(readonly segments: Segment[] = []) {}\n\n  get path(): string {\n    return toRoute(uri.segment(''), this.resource, ...this.segments);\n  }\n\n  get complete(): string {\n    return toRoute(this.host, this.resource, ...this.segments);\n  }\n\n  get isInternal(): boolean {\n    return toRoute(this.host) === (ctx.env.host ?? '$host');\n  }\n\n  protected get props(): List<Prop> {\n    return meta(this.state).values<Prop>();\n  }\n\n  route = (resource: Optional<string> = this.resource.key): string => toRoute(uri.segment(''), uri.segment(resource?.toLowerCase()), ...this.segments);\n\n  set = (segment: Segment, value?: unknown): this => {\n    tryTo(value)\n      .is.defined()\n      .accept(value => (this.state[segment.key ?? ''] = { segment, value }));\n    return this;\n  };\n\n  toString(): string {\n    return tryTo(() => this.props)\n      .map(ps => ps.filter(p => p.segment?.segment))\n      .map(ps => ps.reduce((r: string, p: Prop) => r.replace(asString(p.segment.segment), asString(p.value)), this.complete))\n      .map(route => ({\n        route,\n        query: this.props.mapDefined(p => (p.segment?.query ? p.segment?.query(p.value) : undefined))?.join('&'),\n      }))\n      .map(({ route, query }) => (isNotEmpty(query) ? `${route}?${query}` : route)).value;\n  }\n\n  id = (id?: unknown): this => this.set(EasyUri.id, id);\n  ids = (ids: OneOrMore<unknown>): this => this.set(EasyUri.ids, toArray(ids).join(','));\n  query = (q?: unknown): this => this.set(EasyUri.query, q);\n  sort = (s?: any): this => this.set(EasyUri.sort, asString(s));\n\n  skip = (index?: number): this => this.set(EasyUri.skip, index);\n  take = (items?: number): this => this.set(EasyUri.take, items);\n\n  expand(props: Partial<Props>): this {\n    return entries(props)\n      .filter(([_, v]) => isNotEmpty(v))\n      .reduce((u, [k, v]) => (isBoolean(v) ? u.set(uri.boolean(k), v) : u.set(uri.query(k), toArray(v).join(','))), this);\n  }\n}\n\nexport const clipUri = (uri?: EasyUri | string | null): string =>\n  tryTo(() => asString(uri))\n    .map(uri => uri.replace(/^(https?:\\/\\/)?(www\\.)?/, ''))\n    .map(uri => uri.replace(/\\/$/, '')).value;\n"],"mappings":"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","names":["value","uri"]}
+{"version":3,"sources":["../../src/types/Uri.ts"],"sourcesContent":["import { isBoolean, isNotEmpty, isTrue } from './Is';\nimport { asString, Text } from './Text';\nimport { toName } from './Constructor';\nimport { ctx } from './Context';\nimport { List, toList } from './List';\nimport { meta } from './Meta';\nimport { tryTo } from './Try';\nimport { Optional } from './Types';\nimport { OneOrMore, toArray } from './Array';\nimport { entries } from './Object';\n\nexport type Segment = Text & { key?: string; segment?: string; query?: (value: unknown) => string };\n\nexport const toSegment = (\n  key?: Text,\n  {\n    segment,\n    query,\n  }: {\n    segment?: string;\n    query?: (value: unknown) => string;\n  } = {}\n): Segment => ({\n  key: key as string,\n  segment,\n  query,\n  toString: () => asString(key),\n});\n\nexport const uri = {\n  host: (key?: string): Segment => toSegment(key, { segment: key ?? ctx.env.host ?? '$host' }),\n  resource: <Props extends UriExpandProps>(resource: Uri<Props>): Segment => toSegment(toName(resource, 'Uri'), { segment: toName(resource, 'Uri') }),\n  segment: (key?: Text): Segment => toSegment(key, { segment: key as string }),\n  path: (key: Text): Segment => toSegment(key, { segment: `:${key}` }),\n  query: (key: Text): Segment =>\n    toSegment(key, {\n      query: (value: unknown): string =>\n        tryTo(value)\n          .is.defined()\n          .map(v => encodeURIComponent(asString(v)))\n          .map(v => `${key}=${v}`)\n          .orElse('') ?? '',\n    }),\n  boolean: (key: Text): Segment => toSegment(key, { query: (value: unknown): string => (isTrue(value) ? `${key}` : '') }),\n};\n\ntype Prop = { segment: Segment; value: any };\n\nconst toRoute = (...segments: Segment[]): string =>\n  toList(segments)\n    .mapDefined(s => s.segment)\n    .join('/');\n\nexport type Uri<Props extends UriExpandProps = UriExpandProps> = {\n  id: (id?: unknown) => Uri<Props>;\n  ids: (ids: OneOrMore<unknown>) => Uri<Props>;\n  query: (q?: unknown) => Uri<Props>;\n  sort: (q?: any) => Uri<Props>;\n  skip: (n?: number) => Uri<Props>;\n  take: (n?: number) => Uri<Props>;\n  path: string;\n  route: (resource: string) => string;\n  isInternal: boolean;\n  toString: () => string;\n  expand: (props: Partial<Props>) => Uri<Props>;\n};\n\nexport type UriExpandProps = { q?: string; s?: string; skip?: number; take?: number };\n\nexport class EasyUri<Props extends UriExpandProps = UriExpandProps> implements Uri<Props> {\n  static readonly id = uri.path('id');\n  static readonly ids = uri.query('ids');\n  static readonly query = uri.query('q');\n  static readonly sort = uri.query('s');\n  static readonly skip = uri.query('skip');\n  static readonly take = uri.query('take');\n\n  readonly host = uri.host();\n  protected resource = uri.resource(this);\n\n  protected state: any = {};\n\n  constructor(readonly segments: Segment[] = []) {}\n\n  get path(): string {\n    return toRoute(uri.segment(''), this.resource, ...this.segments);\n  }\n\n  get complete(): string {\n    return toRoute(this.host, this.resource, ...this.segments);\n  }\n\n  get isInternal(): boolean {\n    return toRoute(this.host) === (ctx.env.host ?? '$host');\n  }\n\n  protected get props(): List<Prop> {\n    return meta(this.state).values<Prop>();\n  }\n\n  route = (resource: Optional<string> = this.resource.key): string => toRoute(uri.segment(''), uri.segment(resource?.toLowerCase()), ...this.segments);\n\n  set = (segment: Segment, value?: unknown): this => {\n    tryTo(value)\n      .is.defined()\n      .accept(value => (this.state[segment.key ?? ''] = { segment, value }));\n    return this;\n  };\n\n  toString(): string {\n    return tryTo(() => this.props)\n      .map(ps => ps.filter(p => p.segment?.segment))\n      .map(ps => ps.reduce((r: string, p: Prop) => r.replace(asString(p.segment.segment), asString(p.value)), this.complete))\n      .map(route => ({\n        route,\n        query: this.props.mapDefined(p => (p.segment?.query ? p.segment?.query(p.value) : undefined))?.join('&'),\n      }))\n      .map(({ route, query }) => (isNotEmpty(query) ? `${route}?${query}` : route)).value;\n  }\n\n  id = (id?: unknown): this => this.set(EasyUri.id, id);\n  ids = (ids: OneOrMore<unknown>): this => this.set(EasyUri.ids, toArray(ids).join(','));\n  query = (q?: unknown): this => this.set(EasyUri.query, q);\n  sort = (s?: any): this => this.set(EasyUri.sort, asString(s));\n\n  skip = (index?: number): this => this.set(EasyUri.skip, index);\n  take = (items?: number): this => this.set(EasyUri.take, items);\n\n  expand(props: Partial<Props>): this {\n    return entries(props as any)\n      .filter(([_, v]) => isNotEmpty(v))\n      .reduce((u, [k, v]) => (isBoolean(v) ? u.set(uri.boolean(k), v) : u.set(uri.query(k), toArray(v).join(','))), this);\n  }\n}\n\nexport const clipUri = (uri?: EasyUri | string | null): string =>\n  tryTo(() => asString(uri))\n    .map(uri => uri.replace(/^(https?:\\/\\/)?(www\\.)?/, ''))\n    .map(uri => uri.replace(/\\/$/, '')).value;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaO,IAAM,YAAY,CACvB,KACA;AAAA,EACE;AAAA,EACA;AACF,IAGI,CAAC,OACQ;AAAA,EACb;AAAA,EACA;AAAA,EACA;AAAA,EACA,UAAU,MAAM,SAAS,GAAG;AAC9B;AAEO,IAAM,MAAM;AAAA,EACjB,MAAM,CAAC,QAA0B,UAAU,KAAK,EAAE,SAAS,OAAO,IAAI,IAAI,QAAQ,QAAQ,CAAC;AAAA,EAC3F,UAAU,CAA+B,aAAkC,UAAU,OAAO,UAAU,KAAK,GAAG,EAAE,SAAS,OAAO,UAAU,KAAK,EAAE,CAAC;AAAA,EAClJ,SAAS,CAAC,QAAwB,UAAU,KAAK,EAAE,SAAS,IAAc,CAAC;AAAA,EAC3E,MAAM,CAAC,QAAuB,UAAU,KAAK,EAAE,SAAS,IAAI,GAAG,GAAG,CAAC;AAAA,EACnE,OAAO,CAAC,QACN,UAAU,KAAK;AAAA,IACb,OAAO,CAAC,UACN,MAAM,KAAK,EACR,GAAG,QAAQ,EACX,IAAI,OAAK,mBAAmB,SAAS,CAAC,CAAC,CAAC,EACxC,IAAI,OAAK,GAAG,GAAG,IAAI,CAAC,EAAE,EACtB,OAAO,EAAE,KAAK;AAAA,EACrB,CAAC;AAAA,EACH,SAAS,CAAC,QAAuB,UAAU,KAAK,EAAE,OAAO,CAAC,UAA4B,OAAO,KAAK,IAAI,GAAG,GAAG,KAAK,GAAI,CAAC;AACxH;AAIA,IAAM,UAAU,IAAI,aAClB,OAAO,QAAQ,EACZ,WAAW,OAAK,EAAE,OAAO,EACzB,KAAK,GAAG;AAkBN,IAAM,UAAN,MAAM,SAA6E;AAAA,EAaxF,YAAqB,WAAsB,CAAC,GAAG;AAA1B;AAAA,EAA2B;AAAA,EAZhD,OAAgB,KAAK,IAAI,KAAK,IAAI;AAAA,EAClC,OAAgB,MAAM,IAAI,MAAM,KAAK;AAAA,EACrC,OAAgB,QAAQ,IAAI,MAAM,GAAG;AAAA,EACrC,OAAgB,OAAO,IAAI,MAAM,GAAG;AAAA,EACpC,OAAgB,OAAO,IAAI,MAAM,MAAM;AAAA,EACvC,OAAgB,OAAO,IAAI,MAAM,MAAM;AAAA,EAE9B,OAAO,IAAI,KAAK;AAAA,EACf,WAAW,IAAI,SAAS,IAAI;AAAA,EAE5B,QAAa,CAAC;AAAA,EAIxB,IAAI,OAAe;AACjB,WAAO,QAAQ,IAAI,QAAQ,EAAE,GAAG,KAAK,UAAU,GAAG,KAAK,QAAQ;AAAA,EACjE;AAAA,EAEA,IAAI,WAAmB;AACrB,WAAO,QAAQ,KAAK,MAAM,KAAK,UAAU,GAAG,KAAK,QAAQ;AAAA,EAC3D;AAAA,EAEA,IAAI,aAAsB;AACxB,WAAO,QAAQ,KAAK,IAAI,OAAO,IAAI,IAAI,QAAQ;AAAA,EACjD;AAAA,EAEA,IAAc,QAAoB;AAChC,WAAO,KAAK,KAAK,KAAK,EAAE,OAAa;AAAA,EACvC;AAAA,EAEA,QAAQ,CAAC,WAA6B,KAAK,SAAS,QAAgB,QAAQ,IAAI,QAAQ,EAAE,GAAG,IAAI,QAAQ,UAAU,YAAY,CAAC,GAAG,GAAG,KAAK,QAAQ;AAAA,EAEnJ,MAAM,CAAC,SAAkB,UAA0B;AACjD,UAAM,KAAK,EACR,GAAG,QAAQ,EACX,OAAO,CAAAA,WAAU,KAAK,MAAM,QAAQ,OAAO,EAAE,IAAI,EAAE,SAAS,OAAAA,OAAM,CAAE;AACvE,WAAO;AAAA,EACT;AAAA,EAEA,WAAmB;AACjB,WAAO,MAAM,MAAM,KAAK,KAAK,EAC1B,IAAI,QAAM,GAAG,OAAO,OAAK,EAAE,SAAS,OAAO,CAAC,EAC5C,IAAI,QAAM,GAAG,OAAO,CAAC,GAAW,MAAY,EAAE,QAAQ,SAAS,EAAE,QAAQ,OAAO,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,EACrH,IAAI,YAAU;AAAA,MACb;AAAA,MACA,OAAO,KAAK,MAAM,WAAW,OAAM,EAAE,SAAS,QAAQ,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,MAAU,GAAG,KAAK,GAAG;AAAA,IACzG,EAAE,EACD,IAAI,CAAC,EAAE,OAAO,MAAM,MAAO,WAAW,KAAK,IAAI,GAAG,KAAK,IAAI,KAAK,KAAK,KAAM,EAAE;AAAA,EAClF;AAAA,EAEA,KAAK,CAAC,OAAuB,KAAK,IAAI,SAAQ,IAAI,EAAE;AAAA,EACpD,MAAM,CAAC,QAAkC,KAAK,IAAI,SAAQ,KAAK,QAAQ,GAAG,EAAE,KAAK,GAAG,CAAC;AAAA,EACrF,QAAQ,CAAC,MAAsB,KAAK,IAAI,SAAQ,OAAO,CAAC;AAAA,EACxD,OAAO,CAAC,MAAkB,KAAK,IAAI,SAAQ,MAAM,SAAS,CAAC,CAAC;AAAA,EAE5D,OAAO,CAAC,UAAyB,KAAK,IAAI,SAAQ,MAAM,KAAK;AAAA,EAC7D,OAAO,CAAC,UAAyB,KAAK,IAAI,SAAQ,MAAM,KAAK;AAAA,EAE7D,OAAO,OAA6B;AAClC,WAAO,QAAQ,KAAY,EACxB,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC,EAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAO,UAAU,CAAC,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,GAAI,IAAI;AAAA,EACtH;AACF;AAEO,IAAM,UAAU,CAACC,SACtB,MAAM,MAAM,SAASA,IAAG,CAAC,EACtB,IAAI,CAAAA,SAAOA,KAAI,QAAQ,2BAA2B,EAAE,CAAC,EACrD,IAAI,CAAAA,SAAOA,KAAI,QAAQ,OAAO,EAAE,CAAC,EAAE;","names":["value","uri"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "17.19.0",
+  "version": "17.20.1",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/domain/Typo.ts

@@ -1,14 +1,16 @@
 import { View } from '../utils/View';
 import { FetchOptions, Gateway } from '../types/Gateway';
 import { Repository } from '../types/Repository';
-import { Json, JsonValue } from '../types/Json';
+import { Json, JsonValue, toJson } from '../types/Json';
 import { PageList } from '../types/PageList';
 import { Id, Key } from '../types/Id';
 import { when } from '../validation/When';
 import { Exception } from '../types/Exception';
 import { List } from '../types/List';
+import { RouteGateway } from '../services/RouteGateway';
+import { RouteOptions } from '../services/Api';
 
-export class Typo<T, Options = FetchOptions> extends Repository<T, Options> {
+export class Typo<T, Options extends RouteOptions = RouteOptions> extends Repository<T, Options> {
   constructor(
     protected view: View<T>,
     private readonly gateway: Gateway<Options>
@@ -53,3 +55,57 @@ export class Typo<T, Options = FetchOptions> extends Repository<T, Options> {
     return this.gateway.exists(id);
   }
 }
+
+export class Agent<T, Options extends FetchOptions = FetchOptions> extends Repository<T, Options> {
+  constructor(private gateway: RouteGateway) {
+    super();
+  }
+
+  all(options?: Options): Promise<PageList<T>> {
+    return this.gateway.all(options) as Promise<PageList<T>>;
+  }
+
+  byId(id: Id): Promise<T> {
+    return this.gateway.byId(id) as Promise<T>;
+  }
+
+  byIds(...ids: Id[]): Promise<List<T>> {
+    return this.gateway.byIds(...ids) as Promise<List<T>>;
+  }
+
+  byKey(key: Key, options?: Options): Promise<PageList<T>> {
+    return this.gateway.by('key', key, options) as Promise<PageList<T>>;
+  }
+
+  by(key: keyof T, value: JsonValue, options?: Options): Promise<PageList<T>> {
+    return this.gateway.by(key.toString(), value, options) as Promise<PageList<T>>;
+  }
+
+  search(q: JsonValue, options?: Options): Promise<PageList<T>> {
+    return this.gateway.search(q, options) as Promise<PageList<T>>;
+  }
+
+  filter(options?: Options): Promise<PageList<T>> {
+    return this.gateway.filter(options) as Promise<PageList<T>>;
+  }
+
+  exists(id: Id): Promise<boolean> {
+    return this.gateway.exists(id);
+  }
+
+  add(t: Partial<T>): Promise<T> {
+    return this.gateway.add(toJson(t)) as Promise<T>;
+  }
+
+  update(id: Id, t: Partial<T>): Promise<T> {
+    return this.gateway.update({ ...toJson(t), id }) as Promise<T>;
+  }
+
+  upsert(id: Id, t: Partial<T>): Promise<T> {
+    return this.gateway.upsert({ ...toJson(t), id }) as Promise<T>;
+  }
+
+  remove(id: Id): Promise<boolean> {
+    return this.gateway.remove(id);
+  }
+}

package/src/index.ts

@@ -121,4 +121,3 @@ export * from './utils/Wait';
 export * from './validation/Contraints';
 export * from './validation/Validate';
 export * from './validation/When';
-export { IdName } from './types/IdName';

package/src/services/RouteGateway.ts

@@ -1,7 +1,7 @@
-import { Api, RouteOptions } from './Api';
+import { Api } from './Api';
 import { ApiGateway } from './ApiGateway';
 import { Func } from '../types/Func';
-import { Uri } from '../types/Uri';
+import { Uri, UriExpandProps } from '../types/Uri';
 import { PageList } from '../types/PageList';
 import { Json, JsonValue } from '../types/Json';
 import { Id } from '../types/Id';
@@ -9,55 +9,56 @@ import { Optional } from '../types/Types';
 import { List } from '../types/List';
 import { toArray } from '../types/Array';
 import { HttpStatus } from '../http/HttpStatus';
+import { isDefined } from '../types/Is';
 
-export class RouteGateway extends ApiGateway {
+export class RouteGateway<Props extends UriExpandProps = UriExpandProps> extends ApiGateway {
   constructor(
-    readonly route: Func<Uri>,
-    readonly routeId: Func<Uri>,
+    readonly route: Func<Uri<Props>>,
+    readonly routeId: Func<Uri<Props>>,
     readonly api: Api = new Api()
   ) {
     super(api);
   }
 
-  all(options?: RouteOptions): Promise<PageList<Json>> {
-    return this.get(this.route(), options);
+  all(options?: Props): Promise<PageList<Json>> {
+    return this.get(this.route().expand(options ?? {}) as Uri, options);
   }
 
-  byId(id: Id, options?: RouteOptions): Promise<Optional<Json>> {
-    return this.getOne(this.routeId().id(id));
+  byId(id: Id): Promise<Optional<Json>> {
+    return this.getOne(this.routeId().id(id) as Uri);
   }
 
   byIds(...ids: Id[]): Promise<List<Json>> {
-    return this.get(this.route().ids(toArray(...ids)));
+    return this.get(this.route().ids(toArray(...ids)) as Uri);
   }
 
-  search(q: JsonValue, options?: RouteOptions): Promise<PageList<Json>> {
-    return this.get(this.route().query(q), options);
+  search(q: JsonValue, options?: Props): Promise<PageList<Json>> {
+    return this.get(this.route().expand({ ...options, q } as Props) as Uri);
   }
 
-  exists(id: Id, options?: RouteOptions): Promise<boolean> {
-    return this.get(this.routeId().id(id))
-      .then(r => r.length === 1)
+  exists(id: Id): Promise<boolean> {
+    return this.byId(id)
+      .then(r => isDefined(r))
       .catch(r => (HttpStatus.NotFound.equals(r.status) ? false : Promise.reject(r)));
   }
 
-  add(item: Json, options?: RouteOptions): Promise<Json> {
-    return this.post(this.route(), item, options);
+  add(item: Json): Promise<Json> {
+    return this.post(this.route() as Uri, item);
   }
 
-  filter(options?: RouteOptions): Promise<PageList<Json>> {
-    return this.postSearch(this.route(), options);
+  filter(options?: Props): Promise<PageList<Json>> {
+    return this.postSearch(this.route().expand(options ?? {}) as Uri);
   }
 
-  update(item: Json, options?: RouteOptions): Promise<Json> {
-    return this.patch(this.routeId().id(item.id), item, options);
+  update(item: Json): Promise<Json> {
+    return this.patch(this.routeId().id(item.id) as Uri, item);
   }
 
-  upsert(item: Json, options?: RouteOptions): Promise<Json> {
-    return this.put(this.routeId().id(item.id), item, options);
+  upsert(item: Json): Promise<Json> {
+    return this.put(this.routeId().id(item.id) as Uri, item);
   }
 
-  remove(id: Id, options?: RouteOptions): Promise<boolean> {
-    return this.delete(this.routeId().id(id), options);
+  remove(id: Id): Promise<boolean> {
+    return this.delete(this.routeId().id(id) as Uri);
   }
 }

package/src/types/Repository.ts

@@ -39,11 +39,11 @@ export class Repository<T, Options = FetchOptions> {
     return reject(Exception.IsNotImplemented);
   }
 
-  add(t: T | Json): Promise<T> {
+  add(t: Partial<T> | Json): Promise<T> {
     return reject(Exception.IsNotImplemented);
   }
 
-  update(id: Id, json: Json): Promise<T> {
+  update(id: Id, json: Partial<T> | Json): Promise<T> {
     return reject(Exception.IsNotImplemented);
   }
 
@@ -51,7 +51,7 @@ export class Repository<T, Options = FetchOptions> {
     return reject(Exception.IsNotImplemented);
   }
 
-  upsert(id: Id, item: Json): Promise<T> {
+  upsert(id: Id, item: Partial<T> | Json): Promise<T> {
     return reject(Exception.IsNotImplemented);
   }
 }

package/src/types/Uri.ts

@@ -29,7 +29,7 @@ export const toSegment = (
 
 export const uri = {
   host: (key?: string): Segment => toSegment(key, { segment: key ?? ctx.env.host ?? '$host' }),
-  resource: (resource: Uri): Segment => toSegment(toName(resource, 'Uri'), { segment: toName(resource, 'Uri') }),
+  resource: <Props extends UriExpandProps>(resource: Uri<Props>): Segment => toSegment(toName(resource, 'Uri'), { segment: toName(resource, 'Uri') }),
   segment: (key?: Text): Segment => toSegment(key, { segment: key as string }),
   path: (key: Text): Segment => toSegment(key, { segment: `:${key}` }),
   query: (key: Text): Segment =>
@@ -51,22 +51,23 @@ const toRoute = (...segments: Segment[]): string =>
     .mapDefined(s => s.segment)
     .join('/');
 
-export type Uri = {
-  id: (id?: unknown) => Uri;
-  ids: (ids: OneOrMore<unknown>) => Uri;
-  query: (q?: unknown) => Uri;
-  sort: (q?: any) => Uri;
-  skip: (n?: number) => Uri;
-  take: (n?: number) => Uri;
+export type Uri<Props extends UriExpandProps = UriExpandProps> = {
+  id: (id?: unknown) => Uri<Props>;
+  ids: (ids: OneOrMore<unknown>) => Uri<Props>;
+  query: (q?: unknown) => Uri<Props>;
+  sort: (q?: any) => Uri<Props>;
+  skip: (n?: number) => Uri<Props>;
+  take: (n?: number) => Uri<Props>;
   path: string;
   route: (resource: string) => string;
   isInternal: boolean;
   toString: () => string;
+  expand: (props: Partial<Props>) => Uri<Props>;
 };
 
-export type UriExpandProps = { q: string; s: string };
+export type UriExpandProps = { q?: string; s?: string; skip?: number; take?: number };
 
-export class EasyUri<Props = UriExpandProps> implements Uri {
+export class EasyUri<Props extends UriExpandProps = UriExpandProps> implements Uri<Props> {
   static readonly id = uri.path('id');
   static readonly ids = uri.query('ids');
   static readonly query = uri.query('q');
@@ -126,7 +127,7 @@ export class EasyUri<Props = UriExpandProps> implements Uri {
   take = (items?: number): this => this.set(EasyUri.take, items);
 
   expand(props: Partial<Props>): this {
-    return entries(props)
+    return entries(props as any)
       .filter(([_, v]) => isNotEmpty(v))
       .reduce((u, [k, v]) => (isBoolean(v) ? u.set(uri.boolean(k), v) : u.set(uri.query(k), toArray(v).join(','))), this);
   }

package/dist/chunk-3XD77BIN.mjs

@@ -1,57 +0,0 @@
-import {
-  ApiGateway
-} from "./chunk-3MDXTFJG.mjs";
-import {
-  Api
-} from "./chunk-RTTVCEWR.mjs";
-import {
-  HttpStatus
-} from "./chunk-H27UMLDT.mjs";
-import {
-  toArray
-} from "./chunk-CO2AFYVD.mjs";
-
-// src/services/RouteGateway.ts
-var RouteGateway = class extends ApiGateway {
-  constructor(route, routeId, api = new Api()) {
-    super(api);
-    this.route = route;
-    this.routeId = routeId;
-    this.api = api;
-  }
-  all(options) {
-    return this.get(this.route(), options);
-  }
-  byId(id, options) {
-    return this.getOne(this.routeId().id(id));
-  }
-  byIds(...ids) {
-    return this.get(this.route().ids(toArray(...ids)));
-  }
-  search(q, options) {
-    return this.get(this.route().query(q), options);
-  }
-  exists(id, options) {
-    return this.get(this.routeId().id(id)).then((r) => r.length === 1).catch((r) => HttpStatus.NotFound.equals(r.status) ? false : Promise.reject(r));
-  }
-  add(item, options) {
-    return this.post(this.route(), item, options);
-  }
-  filter(options) {
-    return this.postSearch(this.route(), options);
-  }
-  update(item, options) {
-    return this.patch(this.routeId().id(item.id), item, options);
-  }
-  upsert(item, options) {
-    return this.put(this.routeId().id(item.id), item, options);
-  }
-  remove(id, options) {
-    return this.delete(this.routeId().id(id), options);
-  }
-};
-
-export {
-  RouteGateway
-};
-//# sourceMappingURL=chunk-3XD77BIN.mjs.map

package/dist/chunk-3XD77BIN.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/services/RouteGateway.ts"],"sourcesContent":["import { Api, RouteOptions } from './Api';\nimport { ApiGateway } from './ApiGateway';\nimport { Func } from '../types/Func';\nimport { Uri } from '../types/Uri';\nimport { PageList } from '../types/PageList';\nimport { Json, JsonValue } from '../types/Json';\nimport { Id } from '../types/Id';\nimport { Optional } from '../types/Types';\nimport { List } from '../types/List';\nimport { toArray } from '../types/Array';\nimport { HttpStatus } from '../http/HttpStatus';\n\nexport class RouteGateway extends ApiGateway {\n  constructor(\n    readonly route: Func<Uri>,\n    readonly routeId: Func<Uri>,\n    readonly api: Api = new Api()\n  ) {\n    super(api);\n  }\n\n  all(options?: RouteOptions): Promise<PageList<Json>> {\n    return this.get(this.route(), options);\n  }\n\n  byId(id: Id, options?: RouteOptions): Promise<Optional<Json>> {\n    return this.getOne(this.routeId().id(id));\n  }\n\n  byIds(...ids: Id[]): Promise<List<Json>> {\n    return this.get(this.route().ids(toArray(...ids)));\n  }\n\n  search(q: JsonValue, options?: RouteOptions): Promise<PageList<Json>> {\n    return this.get(this.route().query(q), options);\n  }\n\n  exists(id: Id, options?: RouteOptions): Promise<boolean> {\n    return this.get(this.routeId().id(id))\n      .then(r => r.length === 1)\n      .catch(r => (HttpStatus.NotFound.equals(r.status) ? false : Promise.reject(r)));\n  }\n\n  add(item: Json, options?: RouteOptions): Promise<Json> {\n    return this.post(this.route(), item, options);\n  }\n\n  filter(options?: RouteOptions): Promise<PageList<Json>> {\n    return this.postSearch(this.route(), options);\n  }\n\n  update(item: Json, options?: RouteOptions): Promise<Json> {\n    return this.patch(this.routeId().id(item.id), item, options);\n  }\n\n  upsert(item: Json, options?: RouteOptions): Promise<Json> {\n    return this.put(this.routeId().id(item.id), item, options);\n  }\n\n  remove(id: Id, options?: RouteOptions): Promise<boolean> {\n    return this.delete(this.routeId().id(id), options);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AAYO,IAAM,eAAN,cAA2B,WAAW;AAAA,EAC3C,YACW,OACA,SACA,MAAW,IAAI,IAAI,GAC5B;AACA,UAAM,GAAG;AAJA;AACA;AACA;AAAA,EAGX;AAAA,EAEA,IAAI,SAAiD;AACnD,WAAO,KAAK,IAAI,KAAK,MAAM,GAAG,OAAO;AAAA,EACvC;AAAA,EAEA,KAAK,IAAQ,SAAiD;AAC5D,WAAO,KAAK,OAAO,KAAK,QAAQ,EAAE,GAAG,EAAE,CAAC;AAAA,EAC1C;AAAA,EAEA,SAAS,KAAgC;AACvC,WAAO,KAAK,IAAI,KAAK,MAAM,EAAE,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC;AAAA,EACnD;AAAA,EAEA,OAAO,GAAc,SAAiD;AACpE,WAAO,KAAK,IAAI,KAAK,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO;AAAA,EAChD;AAAA,EAEA,OAAO,IAAQ,SAA0C;AACvD,WAAO,KAAK,IAAI,KAAK,QAAQ,EAAE,GAAG,EAAE,CAAC,EAClC,KAAK,OAAK,EAAE,WAAW,CAAC,EACxB,MAAM,OAAM,WAAW,SAAS,OAAO,EAAE,MAAM,IAAI,QAAQ,QAAQ,OAAO,CAAC,CAAE;AAAA,EAClF;AAAA,EAEA,IAAI,MAAY,SAAuC;AACrD,WAAO,KAAK,KAAK,KAAK,MAAM,GAAG,MAAM,OAAO;AAAA,EAC9C;AAAA,EAEA,OAAO,SAAiD;AACtD,WAAO,KAAK,WAAW,KAAK,MAAM,GAAG,OAAO;AAAA,EAC9C;AAAA,EAEA,OAAO,MAAY,SAAuC;AACxD,WAAO,KAAK,MAAM,KAAK,QAAQ,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,OAAO;AAAA,EAC7D;AAAA,EAEA,OAAO,MAAY,SAAuC;AACxD,WAAO,KAAK,IAAI,KAAK,QAAQ,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,OAAO;AAAA,EAC3D;AAAA,EAEA,OAAO,IAAQ,SAA0C;AACvD,WAAO,KAAK,OAAO,KAAK,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO;AAAA,EACnD;AACF;","names":[]}

package/dist/chunk-ZEZBMEWP.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/types/Repository.ts"],"sourcesContent":["import { FetchOptions } from './Gateway';\nimport { PageList } from './PageList';\nimport { Exception } from './Exception';\nimport { reject } from '../utils/Promise';\nimport { Id, Key } from './Id';\nimport { List } from './List';\nimport { Json, JsonValue } from './Json';\n\nexport class Repository<T, Options = FetchOptions> {\n  all(options?: Options): Promise<PageList<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  byId(id: Id): Promise<T> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  byIds(...ids: Id[]): Promise<List<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  byKey(key: Key, options?: Options): Promise<PageList<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  by(key: keyof T, value: JsonValue, options?: Options): Promise<PageList<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  search(q: JsonValue, options?: Options): Promise<PageList<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  filter(options?: Options): Promise<PageList<T>> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  exists(id: Id): Promise<boolean> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  add(t: T | Json): Promise<T> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  update(id: Id, json: Json): Promise<T> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  remove(id: Id): Promise<boolean> {\n    return reject(Exception.IsNotImplemented);\n  }\n\n  upsert(id: Id, item: Json): Promise<T> {\n    return reject(Exception.IsNotImplemented);\n  }\n}\n"],"mappings":";;;;;;;;AAQO,IAAM,aAAN,MAA4C;AAAA,EACjD,IAAI,SAAyC;AAC3C,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,KAAK,IAAoB;AACvB,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,SAAS,KAA6B;AACpC,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,MAAM,KAAU,SAAyC;AACvD,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,GAAG,KAAc,OAAkB,SAAyC;AAC1E,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,GAAc,SAAyC;AAC5D,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,SAAyC;AAC9C,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,IAA0B;AAC/B,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,IAAI,GAAyB;AAC3B,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,IAAQ,MAAwB;AACrC,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,IAA0B;AAC/B,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AAAA,EAEA,OAAO,IAAQ,MAAwB;AACrC,WAAO,OAAO,UAAU,gBAAgB;AAAA,EAC1C;AACF;","names":[]}