@nextgis/ngw-connector 3.0.0-alpha.12 → 3.0.0-alpha.13

package/README.md

@@ -46,6 +46,38 @@ We recommend linking to a specific version number `/ngw-connector@[version]`
 npm install @nextgis/ngw-connector
 ```
 
+## TypeScript Support
+
+If you plan to use this library in a TypeScript project, it's recommended to install TypeScript declaration files for NextGIS Web by using the `@nextgis/ngw-types-loader` tool.
+
+### Installing NGW Types
+
+Run the following command to download the latest TypeScript declaration files:
+
+```bash
+npx @nextgis/ngw-types-loader
+```
+
+This will download the declaration file from the default NextGIS Web instance (`https://demo.nextgis.com`) and update your `tsconfig.json` to include it.
+
+If you are using a custom NextGIS Web deployment, you can specify the URL:
+
+```bash
+npx @nextgis/ngw-types-loader https://your-custom-ngw-url.com
+```
+
+After running the tool, ensure that your `tsconfig.json` includes the downloaded file:
+
+```json
+{
+  "include": [
+    "./nextgisweb.d.ts"
+  ]
+}
+```
+
+For more details, refer to the [NGW Types Loader](https://www.npmjs.com/package/@nextgis/ngw-types-loader).
+
 ## Usage
 
 ```javascript
@@ -56,22 +88,25 @@ const ngwConnector = new NgwConnector({
   // auth: {login, password}
 });
 
-ngwConnector.get('resource.item', null, { id: 485 }).then((data) => {
-  console.log(data);
-});
+ngwConnector
+  .route('resource.item', { id: 485 })
+  .get()
+  .then((data) => {
+    console.log(data);
+  });
 
-ngwConnector.post('resource.collection', { data: [RESOURCE JSON] });
-ngwConnector.patch(
-  'feature_layer.feature.collection',
-  { data: [ITEMS JSON] },
-  {
-    id,
+ngwConnector.route('resource.collection').patch({ json: RESOURCE });
+ngwConnector.route('feature_layer.feature.collection', { id }).patch({
+  json: ITEMS,
+  query: {
     srs: 4326,
     geom_format: 'geojson',
-  }
-);
-ngwConnector.put('feature_layer.feature.item', { data: [ITEM JSON] }, { id, fid })
-ngwConnector.delete('feature_layer.feature.item', null, { id, fid })
+  },
+});
+ngwConnector
+  .route('feature_layer.feature.item', { id, fid })
+  .put({ json: ITEM });
+ngwConnector.route('feature_layer.feature.item', { id, fid }).delete();
 
 // Shortcuts methods to find resources
 ngwConnector.getResource(2011); // by id

package/lib/index.d.ts

@@ -1,10 +1,14 @@
 import { Routes } from '@nextgisweb/pyramid/type/route';
-import { EventEmitter } from 'events';
 import Cache from '@nextgis/cache';
+import { EventEmitter } from 'events';
 import { FeatureProperties, DeepPartial } from '@nextgis/utils';
-import { GeoJsonObject, Geometry } from 'geojson';
 import { LegendSymbol } from '@nextgisweb/render/type/api';
-import { ResourceRead, CompositeRead } from '@nextgisweb/resource/type/api';
+import { ResourceCls as ResourceCls$1, ResourceRead, CompositeRead } from '@nextgisweb/resource/type/api';
+import { GeoJsonObject, Geometry } from 'geojson';
+import { BasemapWebMapItemRead, BasemapWebMapRead } from '@nextgisweb/basemap/type/api';
+import { FeatureLayerRead } from '@nextgisweb/feature-layer/type/api';
+import { VectorLayerRead } from '@nextgisweb/vector-layer/type/api';
+import { WebMapRead } from '@nextgisweb/webmap/type/api';
 
 declare class LunkwillParam {
     static VALUES: (string | null)[];
@@ -589,12 +593,16 @@ interface Permission {
     permission: string;
     propagate: boolean;
 }
+/** @deprecated use  ResourceCls from '@nextgisweb/resource/type/api' instead */
+type ResourceCls = ResourceCls$1;
 interface ResourceHierarchy {
     id: number;
     parent: {
         id: any;
     };
 }
+/** @deprecated use  ResourceRead from '@nextgisweb/resource/type/api' instead */
+type Resource = ResourceRead;
 interface BookmarkProperties {
     name: string;
     place: string;
@@ -610,6 +618,8 @@ interface NgwTimeFormat {
     second: number;
 }
 type NgwDateTimeFormat = NgwDateFormat & NgwTimeFormat;
+/** @deprecated use  WebMapRead from '@nextgisweb/resource/type/api' instead */
+type WebmapResource = WebMapRead;
 interface BasemapResource {
     url: string;
     /**
@@ -617,6 +627,10 @@ interface BasemapResource {
      */
     qms: string;
 }
+/** @deprecated use  BasemapWebMapItemRead from '@nextgisweb/resource/type/api' instead */
+type BasemapWebmapItem = BasemapWebMapItemRead;
+/** @deprecated use  BasemapWebMapRead from '@nextgisweb/resource/type/api' instead */
+type BasemapWebmap = BasemapWebMapRead;
 interface LookupTableResource {
     items: Record<string, string>;
 }
@@ -632,7 +646,11 @@ interface FeatureLayerField {
     label_field: boolean;
     typemod?: unknown;
 }
+/** @deprecated use  FeatureLayerRead from '@nextgisweb/resource/type/api' instead */
+type FeatureResource = FeatureLayerRead;
 type GeometryType = 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'POINTZ' | 'LINESTRINGZ' | 'POLYGONZ' | 'MULTIPOINTZ' | 'MULTILINESTRINGZ' | 'MULTIPOLYGONZ';
+/** @deprecated use  VectorLayerRead from '@nextgisweb/resource/type/api' instead */
+type VectorLayer = VectorLayerRead;
 interface FileBucket {
     files: NgwFile[];
     tstamp?: any;
@@ -705,6 +723,8 @@ interface NgwFile {
 interface Resmeta {
     items: Record<string, any>;
 }
+/** @deprecated use  CompositeRead from '@nextgisweb/resource/type/api' instead */
+type ResourceItem = CompositeRead;
 
 type ResourceStoreItemProperties = {
     [name: string]: any;
@@ -874,7 +894,7 @@ type RequestMethods = 'POST' | 'GET' | 'PATCH' | 'DELETE' | 'PUT';
 type NgwExceptions = 'nextgisweb.resource.exception.ResourceNotFound' | 'nextgisweb.core.exception.InsufficientPermissions';
 interface BaseRequestOptions {
     cache?: boolean;
-    signal?: AbortSignal;
+    signal?: AbortSignal | null;
 }
 /**
  * Options for configuring requests to NGW.
@@ -916,7 +936,7 @@ interface RequestOptions<M extends RequestMethods = RequestMethods, K extends ke
     /**
      * Signal object that allows you to communicate with a DOM request (such as fetch) and abort it if desired via an AbortController.
      */
-    signal?: AbortSignal;
+    signal?: AbortSignal | null;
     /**
      * Parameters to be included in the request URL.
      */
@@ -976,6 +996,28 @@ declare class NgwError extends Error {
     constructor(er?: Partial<NgwError>);
 }
 
+/**
+ * Thrown when ...
+ */
+declare class NetworksResponseError extends NgwError {
+    message: string;
+    title: string;
+    detail: string;
+    constructor(obj?: Partial<NetworksResponseError>);
+}
+
+declare function extractError(error: unknown): NetworksResponseError | {
+    title: any;
+    message: any;
+    detail: any;
+    data: any;
+} | {
+    title: string;
+    message: string;
+    detail?: undefined;
+    data?: undefined;
+} | undefined;
+
 /**
  * Thrown when ...
  */
@@ -985,6 +1027,8 @@ declare class InsufficientPermissionsError extends NgwError {
     constructor(obj: InsufficientPermissionsError);
 }
 
+declare function isError(error: unknown): error is Error;
+
 /**
  * Thrown when...
  */
@@ -993,16 +1037,6 @@ declare class NetworkError extends Error {
     constructor(url: string);
 }
 
-/**
- * Thrown when ...
- */
-declare class NetworksResponseError extends NgwError {
-    message: string;
-    title: string;
-    detail: string;
-    constructor(obj?: Partial<NetworksResponseError>);
-}
-
 /**
  * Thrown when ...
  */
@@ -1012,20 +1046,6 @@ declare class ResourceNotFoundError extends NgwError {
     constructor(obj?: ResourceNotFoundError);
 }
 
-declare function isError(error: unknown): error is Error;
-
-declare function extractError(error: unknown): NetworksResponseError | {
-    title: any;
-    message: any;
-    detail: any;
-    data: any;
-} | {
-    title: string;
-    message: string;
-    detail?: undefined;
-    data?: undefined;
-} | undefined;
-
 type errors_AbortError = AbortError;
 declare const errors_AbortError: typeof AbortError;
 type errors_InsufficientPermissionsError = InsufficientPermissionsError;
@@ -1081,7 +1101,7 @@ declare class NgwConnector {
      *   .catch((er) => console.log('Connection problem', er));
      * ```
      */
-    connect(): Promise<PyramidRoute>;
+    connect({ signal, }?: Pick<RequestOptions, 'signal'>): Promise<PyramidRoute>;
     /**
      * Quick way to change NextGIS Web user.
      * @param credentials - New user credentials
@@ -1309,4 +1329,4 @@ interface LayerLegend {
     setSymbolRender?: (symbolIndex: number, status: boolean) => void;
 }
 
-export { type ApiRouteParams, type BaseRequestOptions, type BasemapResource, type BookmarkProperties, type CreatedResource, type Credentials, type DeleteRequestItemsResponseMap, type DeleteRequestOptions, type FeatureItem, type FeatureItemAttachment, type FeatureItemExtensions, type FeatureItemToNgw, type FeatureLayerCount, type FeatureLayerField, type FeatureLayersIdentify, type FeatureLayersIdentifyItems, type FileBucket, type FileMeta, type FileUploadResp, type GeometryType, type GetChildrenOfOptions, type GetRequestItemsResponseMap, type GetRequestOptions, type GetRouteParam, type IdOnly, type KeysWithMethodAndPath, type KeysWithMethods, type KeysWithPaths, type LayerFeature, type LayerLegend, type LoadingQueue, type LookupTableResource, type LunkwillData, type Method, type MethodAvailable, type MethodRequestOptions, type NgwConnectorOptions, type NgwDateFormat, type NgwDateTimeFormat, type NgwExceptions, type NgwExtent, type NgwFile, type NgwLayerIdentifyError, type NgwTimeFormat, type Params, type PatchRequestItemsResponseMap, type PatchRequestOptions, type Permission, type PostRequestItemsResponseMap, type PostRequestOptions, type PutRequestItemsResponseMap, type PutRequestOptions, type PyramidRoute, type PyramidSettings, type PyramidSettingsPyramid, type PyramidSettingsPyramidCompanyLogo, type RequestHeaders, type RequestItemAdditionalParams, type RequestItemKeys, type RequestItemsParams, type RequestItemsParamsMap, type RequestItemsResponseMap, type RequestMethod, type RequestMethods, type RequestOptions, type RequestOptionsBody, type RequestOptionsByMethod, type RequestOptionsJSON, type RequestTransformFunction, type Resmeta, type ResourceDefinition, type ResourceHierarchy, type ResourceIdKeynameDef, type ResourceItemDatatype, type ResourceStoreItem, type ResourceStoreItemDefault, type ResourceStoreItemProperties, type ResponseType, type RouteBody, type RouteMethods, type RouteName, type RouteParameters, type RouteQuery, type RouteRequestOptions, type RouteResp, type RouteResults, type Router, type SrsItem, type ToReturn, type TreeGroup, type TreeItem, type TreeLayer, type UserInfo, type VectorFieldDatatype, type WmsClientConnection, type WmsClientLayer, type WmsServerService, type WmsServerServiceLayer, NgwConnectorExtended as default };
+export { type ApiRouteParams, type BaseRequestOptions, type BasemapResource, type BasemapWebmap, type BasemapWebmapItem, type BookmarkProperties, type CreatedResource, type Credentials, type DeleteRequestItemsResponseMap, type DeleteRequestOptions, type FeatureItem, type FeatureItemAttachment, type FeatureItemExtensions, type FeatureItemToNgw, type FeatureLayerCount, type FeatureLayerField, type FeatureLayersIdentify, type FeatureLayersIdentifyItems, type FeatureResource, type FileBucket, type FileMeta, type FileUploadResp, type GeometryType, type GetChildrenOfOptions, type GetRequestItemsResponseMap, type GetRequestOptions, type GetRouteParam, type IdOnly, type KeysWithMethodAndPath, type KeysWithMethods, type KeysWithPaths, type LayerFeature, type LayerLegend, type LoadingQueue, type LookupTableResource, type LunkwillData, type Method, type MethodAvailable, type MethodRequestOptions, type NgwConnectorOptions, type NgwDateFormat, type NgwDateTimeFormat, type NgwExceptions, type NgwExtent, type NgwFile, type NgwLayerIdentifyError, type NgwTimeFormat, type Params, type PatchRequestItemsResponseMap, type PatchRequestOptions, type Permission, type PostRequestItemsResponseMap, type PostRequestOptions, type PutRequestItemsResponseMap, type PutRequestOptions, type PyramidRoute, type PyramidSettings, type PyramidSettingsPyramid, type PyramidSettingsPyramidCompanyLogo, type RequestHeaders, type RequestItemAdditionalParams, type RequestItemKeys, type RequestItemsParams, type RequestItemsParamsMap, type RequestItemsResponseMap, type RequestMethod, type RequestMethods, type RequestOptions, type RequestOptionsBody, type RequestOptionsByMethod, type RequestOptionsJSON, type RequestTransformFunction, type Resmeta, type Resource, type ResourceCls, type ResourceDefinition, type ResourceHierarchy, type ResourceIdKeynameDef, type ResourceItem, type ResourceItemDatatype, type ResourceStoreItem, type ResourceStoreItemDefault, type ResourceStoreItemProperties, type ResponseType, type RouteBody, type RouteMethods, type RouteName, type RouteParameters, type RouteQuery, type RouteRequestOptions, type RouteResp, type RouteResults, type Router, type SrsItem, type ToReturn, type TreeGroup, type TreeItem, type TreeLayer, type UserInfo, type VectorFieldDatatype, type VectorLayer, type WebmapResource, type WmsClientConnection, type WmsClientLayer, type WmsServerService, type WmsServerServiceLayer, NgwConnectorExtended as default };

package/lib/ngw-connector.cjs.js

@@ -1,13 +1,76 @@
-/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.13; author: NextGIS */
 'use strict';
 
 var utils = require('@nextgis/utils');
-var events = require('events');
 var Cache = require('@nextgis/cache');
+var events = require('events');
+
+const templateRe = /\{ *([\w_-]+) *\}/g;
+function template(str, data) {
+  return str.replace(templateRe, (s, key) => {
+    let value = data[key];
+    if (value === void 0) {
+      throw new Error("No value provided for letiable " + s);
+    } else if (typeof value === "function") {
+      value = value(data);
+    }
+    return value;
+  });
+}
+
+async function apiRequest(opt) {
+  const { params, name, connector, requestOptions } = opt;
+  const apiItems = await connector.connect();
+  let apiItem = apiItems && apiItems[name];
+  if (apiItem) {
+    apiItem = [...apiItem];
+    let url = apiItem.shift();
+    if (apiItem.length) {
+      const replaceParams = {};
+      for (let fry = 0; fry < apiItem.length; fry++) {
+        const arg = apiItem[fry];
+        replaceParams[fry] = `{${arg}}`;
+        if (params[arg] === void 0) {
+          throw new Error(`\`${arg}\` URL API argument is not specified`);
+        }
+      }
+      if (url) {
+        url = template(url, replaceParams);
+      }
+    }
+    if (params) {
+      const paramArray = [];
+      const paramList = params.paramList;
+      if (Array.isArray(paramList)) {
+        paramList.forEach(([key, value]) => {
+          paramArray.push(`${key}=${value}`);
+        });
+      }
+      for (const p in params) {
+        if (apiItem.indexOf(p) === -1) {
+          paramArray.push(`${p}=${params[p]}`);
+        }
+      }
+      if (paramArray.length) {
+        url = `${url}?${paramArray.join("&")}`;
+      }
+    }
+    if (url) {
+      return connector.makeQuery(url, params, {
+        cacheName: name,
+        ...requestOptions
+      });
+    } else {
+      throw new Error("Request URL is not set");
+    }
+  } else {
+    return void 0;
+  }
+}
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.8",
+	version: "3.0.0-alpha.13",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -16,15 +79,15 @@ var pkg = {
 	jsdelivr: "lib/ngw-connector.global.prod.js",
 	types: "lib/index.d.ts",
 	dependencies: {
-		"@nextgis/cache": "^3.0.0-alpha.7",
-		"@nextgis/cancelable-promise": "^3.0.0-alpha.5",
-		"@nextgis/utils": "^3.0.0-alpha.5",
+		"@nextgis/cache": "^3.0.0-alpha.13",
+		"@nextgis/cancelable-promise": "^3.0.0-alpha.13",
+		"@nextgis/utils": "^3.0.0-alpha.13",
 		"@types/events": "^3.0.0",
 		events: "*",
 		"form-data": "^4.0.0"
 	},
 	devDependencies: {
-		"@nextgis/build-tools": "^3.0.0-alpha.5"
+		"@nextgis/build-tools": "^3.0.0-alpha.13"
 	},
 	scripts: {
 		clean: "rimraf ./lib",
@@ -64,30 +127,6 @@ var pkg = {
 	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
 };
 
-const CONNECTORS = [];
-function addConnector(connector) {
-  CONNECTORS.push(connector);
-}
-function findConnector(options) {
-  return CONNECTORS.find((x) => {
-    if (x.options.baseUrl === options.baseUrl) {
-      if (options.auth) {
-        if (x.options.auth) {
-          return utils.objectDeepEqual(x.options.auth, options.auth);
-        }
-      } else {
-        return true;
-      }
-    }
-  });
-}
-function removeConnector(connector) {
-  const index = CONNECTORS.indexOf(connector);
-  if (index !== -1) {
-    CONNECTORS.splice(index, 1);
-  }
-}
-
 class AbortError extends Error {
   constructor(message = "AbortError") {
     super(message);
@@ -128,49 +167,17 @@ class InsufficientPermissionsError extends NgwError {
 
 var __defProp$6 = Object.defineProperty;
 var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, key + "" , value);
-class NetworkError extends Error {
-  constructor(url) {
-    super();
-    __publicField$6(this, "name", "NetworkError");
-    Object.setPrototypeOf(this, NetworkError.prototype);
-    this.message = `Unable to request ${url}.
-    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
-  }
-}
-
-var __defProp$5 = Object.defineProperty;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
 let NetworksResponseError$1 = class NetworksResponseError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$5(this, "message", "There is no response from the server or problem connecting to server.");
-    __publicField$5(this, "title", "Network error");
-    __publicField$5(this, "detail", "Check network connectivity and try again later.");
+    __publicField$6(this, "message", "There is no response from the server or problem connecting to server.");
+    __publicField$6(this, "title", "Network error");
+    __publicField$6(this, "detail", "Check network connectivity and try again later.");
     Object.setPrototypeOf(this, NetworksResponseError.prototype);
   }
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
-class ResourceNotFoundError extends NgwError {
-  constructor(obj) {
-    super(obj);
-    __publicField$4(this, "name", "ResourceNotFoundError");
-    __publicField$4(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
-    Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
-  }
-}
-
-function isError(error) {
-  if (utils.isObject(error)) {
-    return error.status_code && error.exception && error.title;
-  }
-  return false;
-}
-
 function extractError(error) {
   if (utils.isObject(error)) {
     if (error.name && error.message && error.title) {
@@ -196,6 +203,38 @@ function extractError(error) {
   }
 }
 
+function isError(error) {
+  if (utils.isObject(error)) {
+    return error.status_code && error.exception && error.title;
+  }
+  return false;
+}
+
+var __defProp$5 = Object.defineProperty;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, key + "" , value);
+class NetworkError extends Error {
+  constructor(url) {
+    super();
+    __publicField$5(this, "name", "NetworkError");
+    Object.setPrototypeOf(this, NetworkError.prototype);
+    this.message = `Unable to request ${url}.
+    Possibly invalid NGW URL entered or CORS not configured to get request from ${location.origin}`;
+  }
+}
+
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+class ResourceNotFoundError extends NgwError {
+  constructor(obj) {
+    super(obj);
+    __publicField$4(this, "name", "ResourceNotFoundError");
+    __publicField$4(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
+    Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
+  }
+}
+
 var errors = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AbortError: AbortError,
@@ -279,7 +318,7 @@ function lunkwillCheckResponse(lwResp) {
 async function responseJson(response) {
   try {
     return response.json();
-  } catch (e) {
+  } catch {
     throw new Error();
   }
 }
@@ -300,7 +339,7 @@ async function lunkwillResponseUrl(lwResp) {
     try {
       lwResp2 = await fetch(sum, { credentials: "same-origin" });
       lwData2 = await lwResp2.json();
-    } catch (e) {
+    } catch {
       failed = true;
       continue;
     }
@@ -328,7 +367,7 @@ async function lunkwillResponseUrl(lwResp) {
 async function lunkwillFetch(lwRespUrl) {
   try {
     return await window.fetch(lwRespUrl, { credentials: "same-origin" });
-  } catch (e) {
+  } catch {
     throw new NetworksResponseError();
   }
 }
@@ -449,7 +488,7 @@ async function request(path, options, cacheEngine) {
     }
     return body;
   };
-  if (cacheEngine && ((_a = opt.method) == null ? void 0 : _a.toUpperCase()) === "GET") {
+  if (cacheEngine && cache !== false && ((_a = opt.method) == null ? void 0 : _a.toUpperCase()) === "GET") {
     const props = cacheProps ? cacheProps : {
       ...utils.objectRemoveEmpty({
         withCredentials,
@@ -509,29 +548,34 @@ function route(name, connector, ...rest) {
   };
   const methods = ["get", "post", "put", "delete", "patch"];
   for (const method of methods) {
-    const methodResp = async (requestOptions) => {
+    const methodResp = (requestOptions) => {
       var _a;
       const { headers: optHeaders, ...restOpt } = requestOptions || {};
-      const routeData = await connector.connect();
-      const template = routeURL(
-        name,
-        (_a = connector.options.baseUrl) != null ? _a : "",
-        routeData,
-        ...rest
-      );
-      const headers = utils.objectRemoveEmpty({
-        ...connector.getAuthorizationHeaders(),
-        ...optHeaders != null ? optHeaders : {}
+      if ((_a = requestOptions == null ? void 0 : requestOptions.signal) == null ? void 0 : _a.aborted) {
+        throw new AbortError();
+      }
+      return connector.connect().then((routeData) => {
+        var _a2;
+        const template = routeURL(
+          name,
+          (_a2 = connector.options.baseUrl) != null ? _a2 : "",
+          routeData,
+          ...rest
+        );
+        const headers = utils.objectRemoveEmpty({
+          ...connector.getAuthorizationHeaders(),
+          ...optHeaders != null ? optHeaders : {}
+        });
+        return request(
+          template,
+          {
+            headers,
+            ...restOpt,
+            method
+          },
+          connector.cache
+        );
       });
-      return request(
-        template,
-        {
-          headers,
-          ...restOpt,
-          method
-        },
-        connector.cache
-      );
     };
     result[method] = methodResp;
   }
@@ -663,18 +707,29 @@ let loadData;
   };
 }
 
-const templateRe = /\{ *([\w_-]+) *\}/g;
-function template(str, data) {
-  return str.replace(templateRe, (s, key) => {
-    let value = data[key];
-    if (value === void 0) {
-      throw new Error("No value provided for letiable " + s);
-    } else if (typeof value === "function") {
-      value = value(data);
+const CONNECTORS = [];
+function addConnector(connector) {
+  CONNECTORS.push(connector);
+}
+function findConnector(options) {
+  return CONNECTORS.find((x) => {
+    if (x.options.baseUrl === options.baseUrl) {
+      if (options.auth) {
+        if (x.options.auth) {
+          return utils.objectDeepEqual(x.options.auth, options.auth);
+        }
+      } else {
+        return true;
+      }
     }
-    return value;
   });
 }
+function removeConnector(connector) {
+  const index = CONNECTORS.indexOf(connector);
+  if (index !== -1) {
+    CONNECTORS.splice(index, 1);
+  }
+}
 
 var __defProp$2 = Object.defineProperty;
 var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -743,7 +798,9 @@ class NgwConnector {
    *   .catch((er) => console.log('Connection problem', er));
    * ```
    */
-  async connect() {
+  async connect({
+    signal
+  } = {}) {
     const auth = this.options.auth;
     if (auth) {
       const { login, password } = auth;
@@ -752,11 +809,12 @@ class NgwConnector {
       }
     }
     const routeUrl = `${this.routeStr}?client=${this.client}`;
-    return await this.makeQuery(
+    return this.makeQuery(
       routeUrl,
       {},
       {
         cacheName: "route",
+        signal,
         cache: true,
         cacheProps: {
           id: this.id,
@@ -1245,56 +1303,6 @@ class ResourcesControl {
   }
 }
 
-async function apiRequest(opt) {
-  const { params, name, connector, requestOptions } = opt;
-  const apiItems = await connector.connect();
-  let apiItem = apiItems && apiItems[name];
-  if (apiItem) {
-    apiItem = [...apiItem];
-    let url = apiItem.shift();
-    if (apiItem.length) {
-      const replaceParams = {};
-      for (let fry = 0; fry < apiItem.length; fry++) {
-        const arg = apiItem[fry];
-        replaceParams[fry] = `{${arg}}`;
-        if (params[arg] === void 0) {
-          throw new Error(`\`${arg}\` URL API argument is not specified`);
-        }
-      }
-      if (url) {
-        url = template(url, replaceParams);
-      }
-    }
-    if (params) {
-      const paramArray = [];
-      const paramList = params.paramList;
-      if (Array.isArray(paramList)) {
-        paramList.forEach(([key, value]) => {
-          paramArray.push(`${key}=${value}`);
-        });
-      }
-      for (const p in params) {
-        if (apiItem.indexOf(p) === -1) {
-          paramArray.push(`${p}=${params[p]}`);
-        }
-      }
-      if (paramArray.length) {
-        url = `${url}?${paramArray.join("&")}`;
-      }
-    }
-    if (url) {
-      return connector.makeQuery(url, params, {
-        cacheName: name,
-        ...requestOptions
-      });
-    } else {
-      throw new Error("Request URL is not set");
-    }
-  } else {
-    return void 0;
-  }
-}
-
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);