@nextgis/ngw-connector 3.0.0-alpha.8 → 3.0.1

package/lib/ngw-connector.esm-bundler.js

@@ -1,11 +1,111 @@
-/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.8; author: NextGIS */
-import { objectDeepEqual, objectRemoveEmpty, fixUrlStr, defined } from '@nextgis/utils';
-import { EventEmitter } from 'events';
+/** Bundle of @nextgis/ngw-connector; version: 3.0.1; author: NextGIS */
+import { isObject as isObject$1, objectRemoveEmpty, fixUrlStr, objectDeepEqual, defined } from '@nextgis/utils';
 import Cache from '@nextgis/cache';
+import { EventEmitter } from '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;
+  });
+}
+
+var __defProp$b = Object.defineProperty;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$b(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$b(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async$4 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+function apiRequest(opt) {
+  return __async$4(this, null, function* () {
+    const { params, name, connector, requestOptions } = opt;
+    const apiItems = yield 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, __spreadValues$4({
+          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.1",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -14,15 +114,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",
+		"@nextgis/cancelable-promise": "3.0.0",
+		"@nextgis/utils": "3.0.0",
 		"@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"
 	},
 	scripts: {
 		clean: "rimraf ./lib",
@@ -62,30 +162,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 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);
@@ -95,18 +171,18 @@ class AbortError extends Error {
 
 var __defProp$a = Object.defineProperty;
 var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$7 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$8 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
-    __publicField$7(this, "name", "NgwError");
-    __publicField$7(this, "title");
-    __publicField$7(this, "message");
-    __publicField$7(this, "detail");
-    __publicField$7(this, "exception");
-    __publicField$7(this, "status_code");
-    __publicField$7(this, "data");
-    __publicField$7(this, "guru_meditation");
+    __publicField$8(this, "name", "NgwError");
+    __publicField$8(this, "title");
+    __publicField$8(this, "message");
+    __publicField$8(this, "detail");
+    __publicField$8(this, "exception");
+    __publicField$8(this, "status_code");
+    __publicField$8(this, "data");
+    __publicField$8(this, "guru_meditation");
     Object.assign(this, er);
     Object.setPrototypeOf(this, NgwError.prototype);
   }
@@ -114,35 +190,105 @@ class NgwError extends Error {
 
 var __defProp$9 = Object.defineProperty;
 var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$6 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$7 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$6(this, "name", "InsufficientPermissionsError");
-    __publicField$6(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
+    __publicField$7(this, "name", "InsufficientPermissionsError");
+    __publicField$7(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
     Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
   }
 }
 
 var __defProp$8 = Object.defineProperty;
 var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
-class ResourceNotFoundError extends NgwError {
+var __publicField$6 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+let NetworksResponseError$1 = class NetworksResponseError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$5(this, "name", "ResourceNotFoundError");
-    __publicField$5(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
-    Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
+    __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);
+  }
+};
+
+function extractError(error) {
+  if (isObject$1(error)) {
+    if (error.name && error.message && error.title) {
+      return {
+        title: error.title,
+        message: error.message,
+        detail: error.detail || null,
+        data: error.data && error.data.data ? error.data.data : null
+      };
+    } else if (error.exception) {
+      if (error.status === void 0 || error.status === 0 || error.data === void 0) {
+        return new NetworksResponseError$1({
+          title: error.title,
+          status_code: error.status_code,
+          exception: error.exception
+        });
+      }
+    }
+    return {
+      title: typeof error.title === "string" ? error.title : "Unexpected error",
+      message: typeof error.message === "string" ? error.message : "Something went wrong."
+    };
   }
 }
 
+function isError(error) {
+  if (isObject$1(error)) {
+    return error.status_code && error.exception && error.title;
+  }
+  return false;
+}
+
 var __defProp$7 = Object.defineProperty;
 var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __publicField$5 = (obj, key, value) => __defNormalProp$7(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$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$4 = (obj, key, value) => __defNormalProp$6(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,
+  InsufficientPermissionsError: InsufficientPermissionsError,
+  NetworkError: NetworkError,
+  NetworksResponseError: NetworksResponseError$1,
+  NgwError: NgwError,
+  ResourceNotFoundError: ResourceNotFoundError,
+  extractError: extractError,
+  isError: isError
+});
+
+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$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseAPIError extends Error {
   constructor(message) {
     super(message || "Something went wrong.");
-    __publicField$4(this, "title");
+    __publicField$3(this, "title");
     this.name = "BaseAPIError";
     this.title = "Unknown API error";
     if (Error.captureStackTrace) {
@@ -154,7 +300,7 @@ class NetworksResponseError extends BaseAPIError {
   // prettier-ignore
   constructor(message) {
     super(message || "There is no response from the server or problem connecting to server.");
-    __publicField$4(this, "detail");
+    __publicField$3(this, "detail");
     this.title = "Network error";
     this.detail = "Check network connectivity and try again later.";
   }
@@ -168,8 +314,8 @@ class InvalidResponseError extends BaseAPIError {
 class ServerResponseError extends BaseAPIError {
   constructor(data) {
     super(data.message);
-    __publicField$4(this, "detail");
-    __publicField$4(this, "data");
+    __publicField$3(this, "detail");
+    __publicField$3(this, "data");
     this.title = data.title || this.title;
     this.detail = data.detail || null;
     this.data = data;
@@ -179,8 +325,8 @@ class LunkwillError extends Error {
   // prettier-ignore
   constructor(message, data = {}) {
     super(message || "Unexpected error while processing long-running request.");
-    __publicField$4(this, "title");
-    __publicField$4(this, "data");
+    __publicField$3(this, "title");
+    __publicField$3(this, "data");
     this.name = "LunkwillError";
     this.title = "Long-running request error";
     this.data = data;
@@ -200,35 +346,35 @@ class LunkwillRequestFailed extends LunkwillError {
   }
 }
 
-var __defProp$6 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
 var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$4.call(source, prop))
+  if (source != null && __getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$3.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __async$4 = (__this, __arguments, generator) => {
+var __async$3 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -253,7 +399,7 @@ function lunkwillCheckResponse(lwResp) {
   return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
 }
 function responseJson(response) {
-  return __async$4(this, null, function* () {
+  return __async$3(this, null, function* () {
     try {
       return response.json();
     } catch (e) {
@@ -262,7 +408,7 @@ function responseJson(response) {
   });
 }
 function lunkwillResponseUrl(lwResp) {
-  return __async$4(this, null, function* () {
+  return __async$3(this, null, function* () {
     const lwData = yield responseJson(lwResp);
     let delay = lwData.delay_ms;
     const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
@@ -306,7 +452,7 @@ function lunkwillResponseUrl(lwResp) {
   });
 }
 function lunkwillFetch(lwRespUrl) {
-  return __async$4(this, null, function* () {
+  return __async$3(this, null, function* () {
     try {
       return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
     } catch (e) {
@@ -354,14 +500,14 @@ function generateUrl(path, query) {
   return path + urlParams;
 }
 function request(path, options, cacheEngine) {
-  return __async$4(this, null, function* () {
-    var _b;
+  return __async$3(this, null, function* () {
+    var _b, _c;
     const defaults = {
       method: "GET",
       credentials: "same-origin",
       headers: {}
     };
-    const _a = __spreadValues$4(__spreadValues$4({}, defaults), options), {
+    const _a = __spreadValues$3(__spreadValues$3({}, defaults), options), {
       withCredentials,
       responseType,
       cacheProps,
@@ -380,6 +526,7 @@ function request(path, options, cacheEngine) {
       "query",
       "json"
     ]);
+    opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
     if (withCredentials) {
       opt.credentials = "include";
     }
@@ -397,12 +544,12 @@ function request(path, options, cacheEngine) {
       opt.headers = headers;
     }
     const url = generateUrl(path, query);
-    const makeRequest = () => __async$4(this, null, function* () {
+    const makeRequest = () => __async$3(null, null, function* () {
       let response;
       try {
         response = yield fetch(url, opt);
       } catch (e) {
-        if (e.name === "AbortError") {
+        if (opt.signal && opt.signal.aborted) {
           throw e;
         }
         throw new NetworksResponseError();
@@ -437,49 +584,61 @@ function request(path, options, cacheEngine) {
       }
       return body;
     });
-    if (cacheEngine && cache && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
-      const cacheOptions = cacheProps ? cacheProps : __spreadValues$4({}, objectRemoveEmpty({
-        withCredentials,
-        responseType
-      }));
-      return cacheEngine.add(cacheName || url, makeRequest, cacheOptions, false);
+    if (cacheEngine) {
+      if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
+        if (cache !== false) {
+          const props = cacheProps ? cacheProps : __spreadValues$3({}, objectRemoveEmpty({
+            withCredentials,
+            responseType
+          }));
+          return cacheEngine.add(cacheName || url, makeRequest, {
+            props,
+            expirationTime: cache ? void 0 : 500
+          });
+        }
+      } else {
+        const ignoredForClean = ["api/feature_layer/identify"];
+        if (ignoredForClean.every((part) => !path.includes(part))) {
+          cacheEngine.clean();
+        }
+      }
     }
     return makeRequest();
   });
 }
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$3 = Object.defineProperty;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$3.call(source, prop))
+  if (source != null && __getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __async$3 = (__this, __arguments, generator) => {
+var __async$2 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -530,7 +689,7 @@ function routeURL(name, baseUrl, routeData, ...rest) {
 }
 function route(name, connector, ...rest) {
   const result = {
-    url: (opt) => __async$3(this, null, function* () {
+    url: (opt) => __async$2(null, null, function* () {
       var _a;
       const routeData = yield connector.connect();
       const template = routeURL(
@@ -544,45 +703,37 @@ function route(name, connector, ...rest) {
   };
   const methods = ["get", "post", "put", "delete", "patch"];
   for (const method of methods) {
-    const methodResp = (requestOptions) => __async$3(this, null, function* () {
+    const methodResp = (requestOptions) => {
       var _b;
       const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$1(_a, ["headers"]);
-      const routeData = yield connector.connect();
-      const template = routeURL(
-        name,
-        (_b = connector.options.baseUrl) != null ? _b : "",
-        routeData,
-        ...rest
-      );
-      const headers = objectRemoveEmpty(__spreadValues$3(__spreadValues$3({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
-      return request(
-        template,
-        __spreadProps$1(__spreadValues$3({
-          headers
-        }, restOpt), {
-          method
-        }),
-        connector.cache
-      );
-    });
+      if ((_b = requestOptions == null ? void 0 : requestOptions.signal) == null ? void 0 : _b.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 = objectRemoveEmpty(__spreadValues$2(__spreadValues$2({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+        return request(
+          template,
+          __spreadProps$2(__spreadValues$2({
+            headers
+          }, restOpt), {
+            method
+          }),
+          connector.cache
+        );
+      });
+    };
     result[method] = methodResp;
   }
   return result;
 }
 
-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$3 = (obj, key, value) => __defNormalProp$4(obj, key + "" , value);
-class NetworkError extends Error {
-  constructor(url) {
-    super();
-    __publicField$3(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}`;
-  }
-}
-
 function isObject(val) {
   return Object.prototype.toString.call(val) === "[object Object]";
 }
@@ -599,7 +750,7 @@ let loadData;
     const getResponseText = () => {
       try {
         return JSON.parse(xhr.responseText);
-      } catch (er) {
+      } catch (e) {
         return xhr.responseText;
       }
     };
@@ -669,52 +820,63 @@ 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 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$3 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
+var __defProp$2 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$1.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
+  if (source != null && __getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$1.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __publicField$2 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$2 = (__this, __arguments, generator) => {
+var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$1 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -744,12 +906,16 @@ class NgwConnector {
     __publicField$2(this, "user");
     __publicField$2(this, "cache");
     __publicField$2(this, "withCredentials");
+    // Dedicated cache for route requests, as these are executed before any other requests.
+    // This cache does not need to be cleared during the session.
+    __publicField$2(this, "routeCache");
     __publicField$2(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
     __publicField$2(this, "routeStr", "/api/component/pyramid/route");
     __publicField$2(this, "activeRequests", {});
     __publicField$2(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
+    this.routeCache = new Cache({ namespace: "routecache" });
     if (exist) {
       return exist;
     } else {
@@ -799,7 +965,9 @@ class NgwConnector {
    * ```
    */
   connect() {
-    return __async$2(this, null, function* () {
+    return __async$1(this, arguments, function* ({
+      signal
+    } = {}) {
       const auth = this.options.auth;
       if (auth) {
         const { login, password } = auth;
@@ -808,18 +976,9 @@ class NgwConnector {
         }
       }
       const routeUrl = `${this.routeStr}?client=${this.client}`;
-      return yield this.makeQuery(
-        routeUrl,
-        {},
-        {
-          cacheName: "route",
-          cache: true,
-          cacheProps: {
-            id: this.id,
-            auth,
-            baseUrl: this.options.baseUrl
-          }
-        }
+      return this.routeCache.add(
+        this.options.baseUrl || String(this.id),
+        () => this.makeQuery(routeUrl, null, { signal, cache: false })
       );
     });
   }
@@ -840,18 +999,19 @@ class NgwConnector {
     removeConnector(this);
     this.options.auth = void 0;
     this.user = void 0;
+    this.routeCache.clean();
     this.clearCache();
     this.emitter.emit("logout");
   }
   getUserInfo(credentials, options) {
-    return __async$2(this, null, function* () {
+    return __async$1(this, null, function* () {
       if (this.user && this.user.id) {
         return this.user;
       }
       if (credentials) {
         this.options.auth = credentials;
       }
-      const options_ = __spreadValues$2({
+      const options_ = __spreadValues$1({
         headers: this.getAuthorizationHeaders(credentials),
         cache: true
       }, options);
@@ -878,7 +1038,7 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const encodedStr = [login, password].map(encodeURIComponent).join(":");
+      const encodedStr = `${login}:${password}`;
       {
         return window.btoa(encodedStr);
       }
@@ -892,7 +1052,7 @@ class NgwConnector {
     this.activeRequests = {};
   }
   getActiveApiRequests() {
-    return __spreadValues$2({}, this.activeRequests);
+    return __spreadValues$1({}, this.activeRequests);
   }
   route(name, ...rest) {
     return route(name, this, ...rest);
@@ -904,7 +1064,7 @@ class NgwConnector {
    * @param options - Request options
    */
   makeQuery(_0, _1) {
-    return __async$2(this, arguments, function* (url, params, options = {}) {
+    return __async$1(this, arguments, function* (url, params, options = {}) {
       var _b;
       url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
       if (!url) {
@@ -915,7 +1075,7 @@ class NgwConnector {
         url = template(url, restParams);
       }
       url = encodeURI(fixUrlStr(url));
-      options = __spreadValues$2({ withCredentials: this.withCredentials }, options);
+      options = __spreadValues$1({ withCredentials: this.withCredentials }, options);
       const {
         cache,
         signal: externalSignal,
@@ -937,7 +1097,7 @@ class NgwConnector {
         });
       }
       options.signal = internalSignal;
-      const createPromise = () => __async$2(this, null, function* () {
+      const createPromise = () => __async$1(this, null, function* () {
         const id = REQUEST_ID++;
         this.activeRequests[id] = internalAbortController;
         try {
@@ -946,8 +1106,8 @@ class NgwConnector {
           this._cleanActiveRequest(id);
         }
       });
-      if (method === "GET") {
-        const cacheOptions = cacheProps ? cacheProps : __spreadProps(__spreadValues$2({}, objectRemoveEmpty({
+      if (method === "GET" && cache !== false) {
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps$1(__spreadValues$1({}, objectRemoveEmpty({
           headers,
           withCredentials,
           responseType,
@@ -970,7 +1130,7 @@ class NgwConnector {
       var _a;
       if (this.user) {
         options = options || {};
-        options.headers = __spreadValues$2(__spreadValues$2({}, this.getAuthorizationHeaders()), options.headers);
+        options.headers = __spreadValues$1(__spreadValues$1({}, this.getAuthorizationHeaders()), options.headers);
       }
       if (this.requestTransform) {
         const [transUrl, transOptions] = this.requestTransform(url, options);
@@ -1001,7 +1161,7 @@ class NgwConnector {
     });
   }
   _login(credentials, options) {
-    return __async$2(this, null, function* () {
+    return __async$1(this, null, function* () {
       try {
         const data = yield this.getUserInfo(credentials, options);
         this.user = data;
@@ -1029,10 +1189,7 @@ class NgwConnector {
     return er;
   }
 }
-__publicField$2(NgwConnector, "errors", {
-  NgwError,
-  ResourceNotFoundError
-});
+__publicField$2(NgwConnector, "errors", errors);
 
 function resourceCompare(res1, res2) {
   return objectDeepEqual(res1, res2);
@@ -1046,7 +1203,10 @@ function resourceToQuery(resource, prefix = "") {
     if (exclude.indexOf(key) === -1) {
       if (isObject(value)) {
         if (key === "owner_user") {
-          const children = resourceToQuery(value, key);
+          const children = resourceToQuery(
+            value,
+            key
+          );
           Object.assign(query, children);
         } else if (key === "parent" && "id" in value) {
           query.parent_id = value.id;
@@ -1059,24 +1219,27 @@ function resourceToQuery(resource, prefix = "") {
   return query;
 }
 
-var __defProp$2 = Object.defineProperty;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __defProp$1 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$1 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$1 = (__this, __arguments, generator) => {
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1117,7 +1280,7 @@ class ResourcesControl {
    * Fetching resource would be cached to speed up next call
    */
   getOne(resource, requestOptions) {
-    const opt = __spreadValues$1({}, requestOptions);
+    const opt = __spreadValues({}, requestOptions);
     if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
       if (resource.id !== void 0) {
         resource.id;
@@ -1194,9 +1357,11 @@ class ResourcesControl {
         } else {
           Object.assign(query, resourceToQuery(resource));
         }
-        return this.connector.get("resource.search", requestOptions, __spreadValues$1({
-          serialization: "full"
-        }, query)).then((resources) => {
+        return this.connector.route("resource.search").get(__spreadProps(__spreadValues({}, requestOptions), {
+          query: __spreadValues({
+            serialization: "full"
+          }, query)
+        })).then((resources) => {
           if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
             for (const x of resources) {
               this.cache.add("resource.item", Promise.resolve(x), {
@@ -1212,7 +1377,8 @@ class ResourcesControl {
   }
   getParent(resource, requestOptions) {
     return this.getOne(resource, requestOptions).then((child) => {
-      if (child) {
+      var _a, _b;
+      if ((_b = (_a = child == null ? void 0 : child.resource) == null ? void 0 : _a.parent) == null ? void 0 : _b.id) {
         return this.getOne(child.resource.parent.id, requestOptions);
       }
       return Promise.resolve(void 0);
@@ -1244,10 +1410,21 @@ class ResourcesControl {
       }
     });
   }
-  _getChildrenOf(parent, requestOptions, _items = []) {
-    return this.connector.get("resource.collection", requestOptions, {
-      parent
-    }).then((items) => {
+  _getChildrenOf(_0, _1) {
+    return __async(this, arguments, function* (parentDef, requestOptions, _items = []) {
+      let parent = void 0;
+      if (typeof parentDef === "string") {
+        parent = yield this.getId(parentDef, requestOptions);
+      } else if (typeof parentDef === "object") {
+        parent = parentDef.id;
+      } else {
+        parent = parentDef;
+      }
+      const items = yield this.connector.route("resource.collection").get(__spreadProps(__spreadValues({}, requestOptions), {
+        query: {
+          parent
+        }
+      }));
       const recursivePromises = [];
       for (const item of items) {
         if (requestOptions == null ? void 0 : requestOptions.cache) {
@@ -1271,7 +1448,7 @@ class ResourcesControl {
     });
   }
   _cleanResourceItemCache(id) {
-    return __async$1(this, null, function* () {
+    return __async(this, null, function* () {
       var _a;
       const all = this.cache.all();
       const toDelete = [];
@@ -1296,7 +1473,7 @@ class ResourcesControl {
     });
   }
   _fetchResourceById(id, requestOptions) {
-    return this.connector.get("resource.item", requestOptions, { id });
+    return this.connector.route("resource.item", { id }).get(requestOptions);
   }
   _fetchResourceBy(resource, requestOptions) {
     return this.getMany(resource, requestOptions).then((resources) => {
@@ -1324,93 +1501,6 @@ class ResourcesControl {
   }
 }
 
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-function apiRequest(opt) {
-  return __async(this, null, function* () {
-    const { params, name, connector, requestOptions } = opt;
-    const apiItems = yield 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, __spreadValues({
-          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);