@nextgis/ngw-map 3.0.0-alpha.4 → 3.0.0-alpha.6

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.4; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.6; author: NextGIS */
 var domain;
 
 // This constructor is used to store event handlers. Instantiating this is
@@ -29,7 +29,7 @@ EventEmitter.init = function() {
   this.domain = null;
   if (EventEmitter.usingDomains) {
     // if there is an active domain, then attach to it.
-    if (domain.active ) ;
+    if (domain.active) ;
   }
 
   if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
@@ -824,12 +824,12 @@ function fixUrlStr(url) {
   return url.replace(/([^:]\/)\/+/g, "$1");
 }
 
-var __defProp$L = Object.defineProperty;
-var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$w = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$P = Object.defineProperty;
+var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$y = (obj, key, value) => __defNormalProp$P(obj, typeof key !== "symbol" ? key + "" : key, value);
 const _Cache = class _Cache {
   constructor(options = {}) {
-    __publicField$w(this, "cache", []);
+    __publicField$y(this, "cache", []);
     var _a;
     const namespace = (_a = options.namespace) != null ? _a : "default";
     if (_Cache.instance[namespace]) {
@@ -935,12 +935,12 @@ const _Cache = class _Cache {
     return objectDeepEqual(itemProps || {}, objectRemoveEmpty(props));
   }
 };
-__publicField$w(_Cache, "instance", {});
+__publicField$y(_Cache, "instance", {});
 let Cache = _Cache;
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.4",
+	version: "3.0.0-alpha.6",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -949,15 +949,15 @@ var pkg = {
 	jsdelivr: "lib/ngw-connector.global.prod.js",
 	types: "lib/index.d.ts",
 	dependencies: {
-		"@nextgis/cache": "^3.0.0-alpha.4",
-		"@nextgis/cancelable-promise": "^3.0.0-alpha.3",
-		"@nextgis/utils": "^3.0.0-alpha.4",
+		"@nextgis/cache": "^3.0.0-alpha.5",
+		"@nextgis/cancelable-promise": "^3.0.0-alpha.5",
+		"@nextgis/utils": "^3.0.0-alpha.5",
 		"@types/events": "^3.0.0",
 		events: "*",
 		"form-data": "^4.0.0"
 	},
 	devDependencies: {
-		"@nextgis/build-tools": "^3.0.0-alpha.3"
+		"@nextgis/build-tools": "^3.0.0-alpha.5"
 	},
 	scripts: {
 		clean: "rimraf ./lib",
@@ -991,87 +991,179 @@ var pkg = {
 		type: "git",
 		url: "git://github.com/nextgis/nextgis_frontend.git"
 	},
+	engines: {
+		node: ">=18.20.4"
+	},
 	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
 };
 
-var __defProp$K = Object.defineProperty;
-var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$v = (obj, key, value) => __defNormalProp$K(obj, typeof key !== "symbol" ? key + "" : key, value);
+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);
+    this.name = "AbortError";
+  }
+}
+
+var __defProp$O = Object.defineProperty;
+var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$x = (obj, key, value) => __defNormalProp$O(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
-    __publicField$v(this, "name", "NgwError");
-    __publicField$v(this, "title");
-    __publicField$v(this, "message");
-    __publicField$v(this, "detail");
-    __publicField$v(this, "exception");
-    __publicField$v(this, "status_code");
-    __publicField$v(this, "data");
-    __publicField$v(this, "guru_meditation");
+    __publicField$x(this, "name", "NgwError");
+    __publicField$x(this, "title");
+    __publicField$x(this, "message");
+    __publicField$x(this, "detail");
+    __publicField$x(this, "exception");
+    __publicField$x(this, "status_code");
+    __publicField$x(this, "data");
+    __publicField$x(this, "guru_meditation");
     Object.assign(this, er);
     Object.setPrototypeOf(this, NgwError.prototype);
   }
 }
 
-var __defProp$J = Object.defineProperty;
-var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$u = (obj, key, value) => __defNormalProp$J(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$N = Object.defineProperty;
+var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$w = (obj, key, value) => __defNormalProp$N(obj, typeof key !== "symbol" ? key + "" : key, value);
+class InsufficientPermissionsError extends NgwError {
+  constructor(obj) {
+    super(obj);
+    __publicField$w(this, "name", "InsufficientPermissionsError");
+    __publicField$w(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
+    Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
+  }
+}
+
+var __defProp$M = Object.defineProperty;
+var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$v = (obj, key, value) => __defNormalProp$M(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ResourceNotFoundError extends NgwError {
   constructor(obj) {
     super(obj);
-    __publicField$u(this, "name", "ResourceNotFoundError");
-    __publicField$u(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
+    __publicField$v(this, "name", "ResourceNotFoundError");
+    __publicField$v(this, "exception", "nextgisweb.resource.exception.ResourceNotFound");
     Object.setPrototypeOf(this, ResourceNotFoundError.prototype);
   }
 }
 
-function isObject(val) {
-  return Object.prototype.toString.call(val) === "[object Object]";
+var __defProp$L = Object.defineProperty;
+var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$u = (obj, key, value) => __defNormalProp$L(obj, typeof key !== "symbol" ? key + "" : key, value);
+class BaseAPIError extends Error {
+  constructor(message) {
+    super(message || "Something went wrong.");
+    __publicField$u(this, "title");
+    this.name = "BaseAPIError";
+    this.title = "Unknown API error";
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, BaseAPIError);
+    }
+  }
 }
-
-function resourceCompare(res1, res2) {
-  return objectDeepEqual(res1, res2);
+class NetworksResponseError extends BaseAPIError {
+  // prettier-ignore
+  constructor(message) {
+    super(message || "There is no response from the server or problem connecting to server.");
+    __publicField$u(this, "detail");
+    this.title = "Network error";
+    this.detail = "Check network connectivity and try again later.";
+  }
 }
-
-const exclude = ["description"];
-function resourceToQuery(resource, prefix = "") {
-  prefix = prefix ? prefix + "__" : "";
-  const query = {};
-  for (const [key, value] of Object.entries(resource)) {
-    if (exclude.indexOf(key) === -1) {
-      if (isObject(value)) {
-        if (key === "owner_user") {
-          const children = resourceToQuery(value, key);
-          Object.assign(query, children);
-        } else if (key === "parent" && "id" in value) {
-          query.parent_id = value.id;
-        }
-      } else if (defined(value)) {
-        query[prefix + key] = value;
-      }
+class InvalidResponseError extends BaseAPIError {
+  constructor(message) {
+    super(message || "Something went wrong.");
+    this.title = "Unexpected server response";
+  }
+}
+class ServerResponseError extends BaseAPIError {
+  constructor(data) {
+    super(data.message);
+    __publicField$u(this, "detail");
+    __publicField$u(this, "data");
+    this.title = data.title || this.title;
+    this.detail = data.detail || null;
+    this.data = data;
+  }
+}
+class LunkwillError extends Error {
+  // prettier-ignore
+  constructor(message, data = {}) {
+    super(message || "Unexpected error while processing long-running request.");
+    __publicField$u(this, "title");
+    __publicField$u(this, "data");
+    this.name = "LunkwillError";
+    this.title = "Long-running request error";
+    this.data = data;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, LunkwillError);
     }
   }
-  return query;
+}
+class LunkwillRequestCancelled extends LunkwillError {
+  constructor(data) {
+    super("Long-running request was cancelled.", data);
+  }
+}
+class LunkwillRequestFailed extends LunkwillError {
+  constructor(data) {
+    super(void 0, data);
+  }
 }
 
-var __defProp$I = Object.defineProperty;
-var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
-var __hasOwnProp$w = Object.prototype.hasOwnProperty;
-var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$v = (a, b) => {
+var __defProp$K = Object.defineProperty;
+var __getOwnPropSymbols$y = Object.getOwnPropertySymbols;
+var __hasOwnProp$y = Object.prototype.hasOwnProperty;
+var __propIsEnum$y = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$x = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$w.call(b, prop))
-      __defNormalProp$I(a, prop, b[prop]);
-  if (__getOwnPropSymbols$w)
-    for (var prop of __getOwnPropSymbols$w(b)) {
-      if (__propIsEnum$w.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
+    if (__hasOwnProp$y.call(b, prop))
+      __defNormalProp$K(a, prop, b[prop]);
+  if (__getOwnPropSymbols$y)
+    for (var prop of __getOwnPropSymbols$y(b)) {
+      if (__propIsEnum$y.call(b, prop))
+        __defNormalProp$K(a, prop, b[prop]);
     }
   return a;
 };
-var __publicField$t = (obj, key, value) => __defNormalProp$I(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$s = (__this, __arguments, generator) => {
+var __objRest$5 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$y.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$y)
+    for (var prop of __getOwnPropSymbols$y(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$y.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+var __async$u = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1091,307 +1183,238 @@ var __async$s = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-class ResourcesControl {
-  constructor({
-    connector,
-    cacheId
-  }) {
-    __publicField$t(this, "cache");
-    __publicField$t(this, "connector");
-    this.connector = connector;
-    this.cache = new Cache({ namespace: cacheId });
-  }
-  // -------------------------------------------------------------------------
-  // Resource Methods
-  // -------------------------------------------------------------------------
-  /**
-   * Receive resource from NGW by id, keyname or search-object parameter.
-   * @param resource - Resource id, keyname or search-object
-   *
-   * @remarks
-   * Fetching resource would be cached to speed up next call
-   */
-  getOne(resource, requestOptions) {
-    const opt = __spreadValues$v({}, requestOptions);
-    if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
-      if (resource.id !== void 0) {
-        resource.id;
-      } else {
-        if (resource.keyname) {
-          resource.keyname;
-        }
-        if (resource.display_name) {
-          resource.display_name;
-        }
+function lunkwillCheckResponse(lwResp) {
+  const ct = lwResp.headers.get("content-type");
+  return ct !== void 0 && ct !== null && ct.includes("application/vnd.lunkwill.request-summary+json");
+}
+function responseJson(response) {
+  return __async$u(this, null, function* () {
+    try {
+      return response.json();
+    } catch (e) {
+      throw new Error();
+    }
+  });
+}
+function lunkwillResponseUrl(lwResp) {
+  return __async$u(this, null, function* () {
+    const lwData = yield responseJson(lwResp);
+    let delay = lwData.delay_ms;
+    const retry = lwData.retry_ms !== void 0 ? lwData.retry_ms : 2e3;
+    const sum = `/api/lunkwill/${lwData.id}/summary`;
+    const res = `/api/lunkwill/${lwData.id}/response`;
+    const sleep = (msec) => new Promise((resolve) => setTimeout(resolve, msec));
+    let failed = false;
+    let ready = false;
+    while (!ready) {
+      yield sleep(failed ? retry : delay);
+      failed = false;
+      let lwResp2;
+      let lwData2;
+      try {
+        lwResp2 = yield fetch(sum, { credentials: "same-origin" });
+        lwData2 = yield lwResp2.json();
+      } catch (e) {
+        failed = true;
+        continue;
+      }
+      switch (lwData2.status) {
+        case void 0:
+          throw new LunkwillError(void 0, lwData2);
+        case "ready":
+          ready = true;
+          break;
+        case "cancelled":
+          throw new LunkwillRequestCancelled(lwData2);
+        case "failed":
+          throw new LunkwillRequestFailed(lwData2);
+        case "spooled":
+        case "processing":
+        case "buffering":
+          delay = lwData2.delay_ms;
+          break;
+        default:
+          throw new LunkwillError(void 0, lwData2);
       }
     }
-    if (typeof resource === "string") {
-      return this._fetchResourceBy({ keyname: resource }, opt);
-    } else if (typeof resource === "number") {
-      return this._fetchResourceById(resource, opt);
-    } else if (isObject(resource)) {
-      return this._fetchResourceBy(resource, opt);
+    return res;
+  });
+}
+function lunkwillFetch(lwRespUrl) {
+  return __async$u(this, null, function* () {
+    try {
+      return yield window.fetch(lwRespUrl, { credentials: "same-origin" });
+    } catch (e) {
+      throw new NetworksResponseError();
     }
-    return Promise.resolve(void 0);
-  }
-  getOneOrFail(resource, requestOptions) {
-    return this.getOne(resource, requestOptions).then((res) => {
-      if (res) {
-        return res;
-      }
-      throw new ResourceNotFoundError();
-    });
-  }
-  /**
-   * A fast way to retrieve resource ID for any resource definition.
-   * @param resource - Any available resource definition
-   *
-   * @remarks
-   * There are situations when exactly the resource id is needed
-   * (for example, to compose the correct request to the api)
-   * then this method will come in handy to facilitate the extraction of the identifier
-   * if the resource is specified through a keyname or other parameters.
-   */
-  getId(resource, requestOptions) {
-    if (typeof resource === "number") {
-      return Promise.resolve(resource);
-    } else if (typeof resource === "string" || isObject(resource)) {
-      return this.getOne(resource, requestOptions).then((res) => {
-        if (res) {
-          return res.resource.id;
+  });
+}
+const mediaContentTypes = [
+  "application/pdf",
+  "image/png",
+  "image/jpeg",
+  "image/tiff",
+  "text/csv"
+];
+const mediaContentTypesRegex = new RegExp(mediaContentTypes.join("|"));
+function isMediaContentType(contentType) {
+  return mediaContentTypesRegex.test(contentType);
+}
+function encodeQueryParams(value) {
+  const result = [];
+  for (const [k, v] of Object.entries(value)) {
+    if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") {
+      result.push(`${k}=${encodeURIComponent(v)}`);
+    } else if (Array.isArray(v)) {
+      result.push(`${k}=${v.map(encodeURIComponent).join(",")}`);
+    } else {
+      for (const [sk, sv] of Object.entries(v)) {
+        const ske = `${k}[${encodeURIComponent(sk)}]`;
+        if (typeof sv === "string" || typeof sv === "number" || typeof sv === "boolean") {
+          result.push(`${ske}=${encodeURIComponent(sv)}`);
+        } else if (Array.isArray(sv)) {
+          const sve = sv.map(encodeURIComponent);
+          result.push(`${ske}=${sve.join(",")}`);
         }
-      });
+      }
     }
-    return Promise.resolve(void 0);
   }
-  /**
-   * A fast way to retrieve resource ID for any resource definition.
-   * @param resource - Any available resource definition
-   *
-   * @remarks
-   * Similar with {@link NgwConnector.getResourceId | getResourceId} but rise error if resource is not exist.
-   * To not make one more checks if the resource is definitely exists
-   */
-  getIdOrFail(resource, requestOptions) {
-    return this.getId(resource, requestOptions).then((resp) => {
-      if (resp === void 0) {
-        throw new Error();
-      }
-      return resp;
-    });
+  return result.join("&");
+}
+function generateUrl(path, query) {
+  let urlParams = "";
+  if (query !== void 0) {
+    urlParams = "?" + encodeQueryParams(query);
   }
-  getMany(resource, requestOptions) {
-    return this._resourceCacheFilter(resource).then((items) => {
-      if (!items.length) {
-        const query = {};
-        if (resource.keyname) {
-          query.keyname = resource.keyname;
-        } else {
-          Object.assign(query, resourceToQuery(resource));
+  return path + urlParams;
+}
+function request(path, options, cacheEngine) {
+  return __async$u(this, null, function* () {
+    var _b;
+    const defaults = {
+      method: "GET",
+      credentials: "same-origin",
+      headers: {}
+    };
+    const _a = __spreadValues$x(__spreadValues$x({}, defaults), options), {
+      withCredentials,
+      responseType,
+      cacheProps,
+      cacheName,
+      lunkwill,
+      cache,
+      query,
+      json
+    } = _a, opt = __objRest$5(_a, [
+      "withCredentials",
+      "responseType",
+      "cacheProps",
+      "cacheName",
+      "lunkwill",
+      "cache",
+      "query",
+      "json"
+    ]);
+    if (withCredentials) {
+      opt.credentials = "include";
+    }
+    let useLunkwill = false;
+    if (lunkwill !== void 0) {
+      lunkwill.toHeaders(opt.headers || {});
+      useLunkwill = true;
+    }
+    const lunkwillReturnUrl = !!opt.lunkwillReturnUrl;
+    delete opt.lunkwillReturnUrl;
+    if (json !== void 0) {
+      opt.body = JSON.stringify(json);
+      const headers = opt.headers || {};
+      headers["Content-Type"] = "application/json";
+      opt.headers = headers;
+    }
+    const url = generateUrl(path, query);
+    const makeRequest = () => __async$u(this, null, function* () {
+      let response;
+      try {
+        response = yield fetch(url, opt);
+      } catch (e) {
+        if (e.name === "AbortError") {
+          throw e;
         }
-        return this.connector.get("resource.search", requestOptions, __spreadValues$v({
-          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), {
-                id: x.resource.id
-              });
-            }
-          }
-          return resources;
-        });
+        throw new NetworksResponseError();
       }
-      return items;
-    });
-  }
-  getParent(resource, requestOptions) {
-    return this.getOne(resource, requestOptions).then((child) => {
-      if (child) {
-        return this.getOne(child.resource.parent.id, requestOptions);
+      if (useLunkwill && lunkwillCheckResponse(response)) {
+        const lwRespUrl = yield lunkwillResponseUrl(response);
+        if (lunkwillReturnUrl) {
+          return lwRespUrl;
+        }
+        response = yield lunkwillFetch(lwRespUrl);
       }
-      return Promise.resolve(void 0);
-    });
-  }
-  getChildrenOf(resource, requestOptions) {
-    return this.getIdOrFail(resource).then(
-      (parent) => this._getChildrenOf(parent, requestOptions)
-    );
-  }
-  update(resource, data) {
-    return this.getId(resource).then((id) => {
-      if (id !== void 0) {
-        return this.connector.put("resource.item", { data }, { id });
+      const respCType = response.headers.get("content-type");
+      const respJSON = respCType && (respCType.includes("application/json") || respCType.includes("application/vnd.lunkwill.request-summary+json"));
+      let body;
+      try {
+        const respMedia = respCType && isMediaContentType(respCType);
+        if (responseType === "blob" || respMedia) {
+          body = yield response.blob();
+        } else if (respJSON) {
+          body = yield response.json();
+        } else {
+          throw new InvalidResponseError();
+        }
+      } catch (e) {
+        if (e.name === "AbortError" || e instanceof InvalidResponseError) {
+          throw e;
+        }
+        throw new InvalidResponseError();
       }
+      if (400 <= response.status && response.status <= 599) {
+        throw new ServerResponseError(body);
+      }
+      return body;
     });
-  }
-  /**
-   * Fast way to delete resource from NGW and clean cache.
-   * @param resource - Resource definition
-   */
-  delete(resource) {
-    return this.getId(resource).then((id) => {
-      if (id !== void 0) {
-        return this.connector.delete("resource.item", null, { id }).then(() => {
-          this._cleanResourceItemCache(id);
-          return void 0;
-        });
-      }
-    });
-  }
-  _getChildrenOf(parent, requestOptions, _items = []) {
-    return this.connector.get("resource.collection", requestOptions, {
-      parent
-    }).then((items) => {
-      const recursivePromises = [];
-      for (const item of items) {
-        if (requestOptions == null ? void 0 : requestOptions.cache) {
-          this.cache.add("resource.item", Promise.resolve(item), {
-            id: item.resource.id
-          });
-        }
-        _items.push(item);
-        if ((requestOptions == null ? void 0 : requestOptions.recursive) && item.resource.children) {
-          recursivePromises.push(
-            this._getChildrenOf(item.resource.id, requestOptions, _items)
-          );
-        }
-      }
-      if (recursivePromises.length) {
-        return Promise.all(recursivePromises).then(() => {
-          return _items;
-        });
-      }
-      return _items;
-    });
-  }
-  _cleanResourceItemCache(id) {
-    return __async$s(this, null, function* () {
-      var _a;
-      const all = this.cache.all();
-      const toDelete = [];
-      for (const c of all) {
-        const cid = (_a = c.props) == null ? void 0 : _a.id;
-        if (["resource.item", "resource"].includes(c.key) && cid !== void 0) {
-          if (typeof cid === "number") {
-            if (cid === id) {
-              toDelete.push(c);
-            }
-          } else {
-            const rid = yield this.getId(cid);
-            if (rid === id) {
-              toDelete.push(c);
-            }
-          }
-        }
-      }
-      for (const d of toDelete) {
-        this.cache.delete(d);
-      }
-    });
-  }
-  _fetchResourceById(id, requestOptions) {
-    return this.connector.get("resource.item", requestOptions, { id });
-  }
-  _fetchResourceBy(resource, requestOptions) {
-    return this.getMany(resource, requestOptions).then((resources) => {
-      return resources[0];
-    });
-  }
-  _resourceCacheFilter(resource) {
-    return Promise.all(this.cache.matchAll("resource.item")).then(
-      (resources) => {
-        const items = [];
-        resources.filter((x) => {
-          if (x) {
-            if (resource.keyname && x.resource.keyname) {
-              return resource.keyname === x.resource.keyname;
-            }
-            if (defined(resource.id) && defined(x.resource.id)) {
-              return resource.id === x.resource.id;
-            }
-            return resourceCompare(resource, x.resource);
-          }
-        });
-        return items;
-      }
-    );
-  }
-}
-
-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);
-    this.name = "AbortError";
-  }
-}
-
-var __defProp$H = Object.defineProperty;
-var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$s = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
-class InsufficientPermissionsError extends NgwError {
-  constructor(obj) {
-    super(obj);
-    __publicField$s(this, "name", "InsufficientPermissionsError");
-    __publicField$s(this, "exception", "nextgisweb.core.exception.InsufficientPermissions");
-    Object.setPrototypeOf(this, InsufficientPermissionsError.prototype);
-  }
-}
-
-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);
+    if (cacheEngine && cache && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
+      const cacheOptions = cacheProps ? cacheProps : __spreadValues$x({}, objectRemoveEmpty({
+        withCredentials,
+        responseType
+      }));
+      return cacheEngine.add(cacheName || url, makeRequest, cacheOptions, false);
     }
-    return value;
+    return makeRequest();
   });
 }
 
-var __defProp$G = Object.defineProperty;
-var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
-var __hasOwnProp$v = Object.prototype.hasOwnProperty;
-var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$u = (a, b) => {
+var __defProp$J = Object.defineProperty;
+var __defProps$h = Object.defineProperties;
+var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$x = Object.getOwnPropertySymbols;
+var __hasOwnProp$x = Object.prototype.hasOwnProperty;
+var __propIsEnum$x = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$w = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$v.call(b, prop))
-      __defNormalProp$G(a, prop, b[prop]);
-  if (__getOwnPropSymbols$v)
-    for (var prop of __getOwnPropSymbols$v(b)) {
-      if (__propIsEnum$v.call(b, prop))
-        __defNormalProp$G(a, prop, b[prop]);
+    if (__hasOwnProp$x.call(b, prop))
+      __defNormalProp$J(a, prop, b[prop]);
+  if (__getOwnPropSymbols$x)
+    for (var prop of __getOwnPropSymbols$x(b)) {
+      if (__propIsEnum$x.call(b, prop))
+        __defNormalProp$J(a, prop, b[prop]);
     }
   return a;
 };
-var __async$r = (__this, __arguments, generator) => {
+var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
+var __objRest$4 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$x.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$x)
+    for (var prop of __getOwnPropSymbols$x(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$x.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+var __async$t = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1411,70 +1434,94 @@ var __async$r = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-function apiRequest(opt) {
-  return __async$r(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$u({
-          cacheName: name
-        }, requestOptions));
-      } else {
-        throw new Error("Request URL is not set");
-      }
-    } else {
-      return void 0;
+function routeURL(name, baseUrl, routeData, ...rest) {
+  const [template, ...params] = routeData[name];
+  const first = rest[0];
+  let sub;
+  if (first === void 0) {
+    sub = [];
+  } else if (typeof first === "object" && first !== null) {
+    if (rest.length > 1) {
+      throw new Error("Too many arguments for route(name, object)!");
+    }
+    sub = [];
+    for (const [p, v] of Object.entries(first)) {
+      sub[params.indexOf(p)] = String(v);
     }
-  });
+  } else {
+    sub = rest.map((v) => String(v));
+  }
+  return fixUrlStr(
+    baseUrl + template.replace(/\{(\w+)\}/g, function(m, a) {
+      const idx = parseInt(a);
+      const value = sub[idx];
+      if (value === void 0) {
+        const msg = `Undefined parameter ${idx} in "${template}".`;
+        throw new Error(msg);
+      }
+      return String(value);
+    })
+  );
+}
+function route(name, connector, ...rest) {
+  const result = {
+    url: (opt) => __async$t(this, null, function* () {
+      var _a;
+      const routeData = yield connector.connect();
+      const template = routeURL(
+        name,
+        (_a = connector.options.baseUrl) != null ? _a : "",
+        routeData,
+        ...rest
+      );
+      return generateUrl(template, opt == null ? void 0 : opt.query);
+    })
+  };
+  const methods = ["get", "post", "put", "delete", "patch"];
+  for (const method of methods) {
+    const methodResp = (requestOptions) => __async$t(this, null, function* () {
+      var _b;
+      const _a = requestOptions || {}, { headers: optHeaders } = _a, restOpt = __objRest$4(_a, ["headers"]);
+      const routeData = yield connector.connect();
+      const template = routeURL(
+        name,
+        (_b = connector.options.baseUrl) != null ? _b : "",
+        routeData,
+        ...rest
+      );
+      const headers = objectRemoveEmpty(__spreadValues$w(__spreadValues$w({}, connector.getAuthorizationHeaders()), optHeaders != null ? optHeaders : {}));
+      return request(
+        template,
+        __spreadProps$h(__spreadValues$w({
+          headers
+        }, restOpt), {
+          method
+        }),
+        connector.cache
+      );
+    });
+    result[method] = methodResp;
+  }
+  return result;
 }
 
-var __defProp$F = Object.defineProperty;
-var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$r = (obj, key, value) => __defNormalProp$F(obj, key + "" , value);
+var __defProp$I = Object.defineProperty;
+var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$t = (obj, key, value) => __defNormalProp$I(obj, key + "" , value);
 class NetworkError extends Error {
   constructor(url) {
     super();
-    __publicField$r(this, "name", "NetworkError");
+    __publicField$t(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]";
+}
+
 let loadData;
 {
   loadData = (url, callback, options = {}, error, onCancel) => {
@@ -1557,21 +1604,34 @@ let loadData;
   };
 }
 
-var __defProp$E = Object.defineProperty;
+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$H = Object.defineProperty;
 var __defProps$g = Object.defineProperties;
 var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
-var __hasOwnProp$u = Object.prototype.hasOwnProperty;
-var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$t = (a, b) => {
+var __getOwnPropSymbols$w = Object.getOwnPropertySymbols;
+var __hasOwnProp$w = Object.prototype.hasOwnProperty;
+var __propIsEnum$w = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$v = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$u.call(b, prop))
-      __defNormalProp$E(a, prop, b[prop]);
-  if (__getOwnPropSymbols$u)
-    for (var prop of __getOwnPropSymbols$u(b)) {
-      if (__propIsEnum$u.call(b, prop))
-        __defNormalProp$E(a, prop, b[prop]);
+    if (__hasOwnProp$w.call(b, prop))
+      __defNormalProp$H(a, prop, b[prop]);
+  if (__getOwnPropSymbols$w)
+    for (var prop of __getOwnPropSymbols$w(b)) {
+      if (__propIsEnum$w.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
     }
   return a;
 };
@@ -1579,17 +1639,17 @@ var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
 var __objRest$3 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$u.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$w.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$u)
-    for (var prop of __getOwnPropSymbols$u(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$u.call(source, prop))
+  if (source != null && __getOwnPropSymbols$w)
+    for (var prop of __getOwnPropSymbols$w(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$w.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$q = (__this, __arguments, generator) => {
+var __publicField$s = (obj, key, value) => __defNormalProp$H(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$s = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -1614,24 +1674,23 @@ let REQUEST_ID = 0;
 class NgwConnector {
   constructor(options) {
     this.options = options;
-    __publicField$q(this, "id", ID$2++);
-    __publicField$q(this, "emitter", new EventEmitter());
-    __publicField$q(this, "user");
-    __publicField$q(this, "resources");
-    __publicField$q(this, "cache");
-    __publicField$q(this, "withCredentials");
-    __publicField$q(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
-    __publicField$q(this, "routeStr", "/api/component/pyramid/route");
-    __publicField$q(this, "activeRequests", {});
-    __publicField$q(this, "requestTransform");
+    __publicField$s(this, "id", ID$2++);
+    __publicField$s(this, "emitter", new EventEmitter());
+    __publicField$s(this, "user");
+    __publicField$s(this, "cache");
+    __publicField$s(this, "withCredentials");
+    __publicField$s(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
+    __publicField$s(this, "routeStr", "/api/component/pyramid/route");
+    __publicField$s(this, "activeRequests", {});
+    __publicField$s(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
     if (exist) {
       return exist;
     } else {
-      const { route, requestTransform, withCredentials } = this.options;
-      if (route) {
-        this.routeStr = route;
+      const { route: route2, requestTransform, withCredentials } = this.options;
+      if (route2) {
+        this.routeStr = route2;
       }
       if (requestTransform) {
         this.requestTransform = requestTransform;
@@ -1639,10 +1698,6 @@ class NgwConnector {
       if (withCredentials !== void 0) {
         this.withCredentials = withCredentials;
       }
-      this.resources = new ResourcesControl({
-        connector: this,
-        cacheId: options.cacheId
-      });
       addConnector(this);
     }
   }
@@ -1654,7 +1709,6 @@ class NgwConnector {
    */
   clearCache() {
     this.cache.clean();
-    this.resources.cache.clean();
   }
   setRequestTransform(requestTransform) {
     this.requestTransform = requestTransform;
@@ -1676,14 +1730,14 @@ class NgwConnector {
    * Can be used to check connection.
    * @example
    * ```javascript
-   * const connector = new NgwConnector({baseUrl: 'https://demo.nextgis.com'});
+   * const connector = new NgwConnector({ baseUrl: 'https://demo.nextgis.com' });
    * connector.connect()
    *   .then(() => console.log('Ok'))
    *   .catch((er) => console.log('Connection problem', er));
    * ```
    */
   connect() {
-    return __async$q(this, null, function* () {
+    return __async$s(this, null, function* () {
       const auth = this.options.auth;
       if (auth) {
         const { login, password } = auth;
@@ -1691,90 +1745,630 @@ class NgwConnector {
           yield this._login({ login, password });
         }
       }
-      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
+      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
+          }
+        }
+      );
+    });
+  }
+  /**
+   * Quick way to change NextGIS Web user.
+   * @param credentials - New user credentials
+   */
+  login(credentials, options) {
+    this.logout();
+    addConnector(this);
+    return this._login(credentials, options);
+  }
+  /**
+   * Disconnecting a user. Aborting all current requests
+   */
+  logout() {
+    this.abort();
+    removeConnector(this);
+    this.options.auth = void 0;
+    this.user = void 0;
+    this.clearCache();
+    this.emitter.emit("logout");
+  }
+  getUserInfo(credentials, options) {
+    return __async$s(this, null, function* () {
+      if (this.user && this.user.id) {
+        return this.user;
+      }
+      if (credentials) {
+        this.options.auth = credentials;
+      }
+      const options_ = __spreadValues$v({
+        headers: this.getAuthorizationHeaders(credentials),
+        cache: true
+      }, options);
+      return this.makeQuery(
+        "/api/component/auth/current_user",
+        {},
+        options_
+      );
+    });
+  }
+  /**
+   * Obtaining the required Headers for authentication of requests in the NGW.
+   */
+  getAuthorizationHeaders(credentials) {
+    const client = this.makeClientId(credentials);
+    if (client) {
+      return {
+        Authorization: `Basic ${client}`
+      };
+    }
+    return {};
+  }
+  makeClientId(credentials) {
+    credentials = credentials || this.options.auth;
+    if (credentials) {
+      const { login, password } = credentials;
+      const encodedStr = [login, password].map(encodeURIComponent).join(":");
+      {
+        return window.btoa(encodedStr);
+      }
+    }
+  }
+  /** Stop all api requests */
+  abort() {
+    for (const abortController of Object.values(this.activeRequests)) {
+      abortController.abort();
+    }
+    this.activeRequests = {};
+  }
+  getActiveApiRequests() {
+    return __spreadValues$v({}, this.activeRequests);
+  }
+  route(name, ...rest) {
+    return route(name, this, ...rest);
+  }
+  /**
+   * Send request to NGW.
+   * @param url - URL address to NGW
+   * @param params - Query params
+   * @param options - Request options
+   */
+  makeQuery(_0, _1) {
+    return __async$s(this, arguments, function* (url, params, options = {}) {
+      var _b;
+      url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
+      if (!url) {
+        throw new Error("Empty `url` not allowed");
+      }
+      if (params) {
+        const _a = params, restParams = __objRest$3(_a, ["paramList"]);
+        url = template(url, restParams);
+      }
+      url = encodeURI(fixUrlStr(url));
+      options = __spreadValues$v({ withCredentials: this.withCredentials }, options);
+      const {
+        cache,
+        signal: externalSignal,
+        method = "GET",
+        headers,
+        cacheName,
+        cacheProps,
+        responseType,
+        withCredentials
+      } = options;
+      const internalAbortController = new AbortController();
+      const internalSignal = internalAbortController.signal;
+      if (externalSignal) {
+        if (externalSignal.aborted) {
+          throw new AbortError();
+        }
+        externalSignal.addEventListener("abort", () => {
+          internalAbortController.abort();
+        });
+      }
+      options.signal = internalSignal;
+      const createPromise = () => __async$s(this, null, function* () {
+        const id = REQUEST_ID++;
+        this.activeRequests[id] = internalAbortController;
+        try {
+          return this._loadData(url, options);
+        } finally {
+          this._cleanActiveRequest(id);
+        }
+      });
+      if (cache && method === "GET") {
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$v({}, objectRemoveEmpty({
+          headers,
+          withCredentials,
+          responseType,
+          baseUrl: this.options.baseUrl,
+          userId: (_b = this.user) == null ? void 0 : _b.id
+        })), {
+          params
+        });
+        return this.cache.add(
+          cacheName || url,
+          createPromise,
+          cacheOptions,
+          false
+        );
+      }
+      return createPromise();
+    });
+  }
+  _loadData(url, options) {
+    options.responseType = options.responseType || "json";
+    return new Promise((resolve, reject) => {
+      var _a;
+      if (this.user) {
+        options = options || {};
+        options.headers = __spreadValues$v(__spreadValues$v({}, this.getAuthorizationHeaders()), options.headers);
+      }
+      if (this.requestTransform) {
+        const [transUrl, transOptions] = this.requestTransform(url, options);
+        url = transUrl;
+        options = transOptions;
+      }
+      let runOnAbort = void 0;
+      loadData(url, resolve, options, reject, (handler) => {
+        runOnAbort = handler;
+      });
+      (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
+        if (runOnAbort !== void 0) {
+          runOnAbort();
+        }
+        reject(new AbortError());
+      });
+    }).catch((httpError) => {
+      if (httpError.name !== "AbortError") {
+        {
+          console.warn("DEV WARN", httpError);
+        }
+        const er = this._handleHttpError(httpError);
+        if (er) {
+          throw er;
+        }
+      }
+      throw httpError;
+    });
+  }
+  _login(credentials, options) {
+    return __async$s(this, null, function* () {
+      try {
+        const data = yield this.getUserInfo(credentials, options);
+        this.user = data;
+        this.emitter.emit("login", data);
+        return data;
+      } catch (er) {
+        this.emitter.emit("login:error", er);
+        throw er;
+      }
+    });
+  }
+  _cleanActiveRequest(requestId) {
+    delete this.activeRequests[requestId];
+  }
+  _handleHttpError(er) {
+    if (er) {
+      if (er instanceof NgwError) {
+        if (er.exception === "nextgisweb.resource.exception.ResourceNotFound") {
+          throw new ResourceNotFoundError(er);
+        } else if (er.exception === "nextgisweb.core.exception.InsufficientPermissions") {
+          throw new InsufficientPermissionsError(er);
+        }
+      }
+    }
+    return er;
+  }
+}
+__publicField$s(NgwConnector, "errors", {
+  NgwError,
+  ResourceNotFoundError
+});
+
+function resourceCompare(res1, res2) {
+  return objectDeepEqual(res1, res2);
+}
+
+const exclude = ["description"];
+function resourceToQuery(resource, prefix = "") {
+  prefix = prefix ? prefix + "__" : "";
+  const query = {};
+  for (const [key, value] of Object.entries(resource)) {
+    if (exclude.indexOf(key) === -1) {
+      if (isObject(value)) {
+        if (key === "owner_user") {
+          const children = resourceToQuery(value, key);
+          Object.assign(query, children);
+        } else if (key === "parent" && "id" in value) {
+          query.parent_id = value.id;
+        }
+      } else if (defined(value)) {
+        query[prefix + key] = value;
+      }
+    }
+  }
+  return query;
+}
+
+var __defProp$G = Object.defineProperty;
+var __getOwnPropSymbols$v = Object.getOwnPropertySymbols;
+var __hasOwnProp$v = Object.prototype.hasOwnProperty;
+var __propIsEnum$v = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$u = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$v.call(b, prop))
+      __defNormalProp$G(a, prop, b[prop]);
+  if (__getOwnPropSymbols$v)
+    for (var prop of __getOwnPropSymbols$v(b)) {
+      if (__propIsEnum$v.call(b, prop))
+        __defNormalProp$G(a, prop, b[prop]);
+    }
+  return a;
+};
+var __publicField$r = (obj, key, value) => __defNormalProp$G(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$r = (__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());
+  });
+};
+class ResourcesControl {
+  constructor({
+    connector,
+    cacheId
+  }) {
+    __publicField$r(this, "cache");
+    __publicField$r(this, "connector");
+    this.connector = connector;
+    this.cache = new Cache({ namespace: cacheId });
+  }
+  // -------------------------------------------------------------------------
+  // Resource Methods
+  // -------------------------------------------------------------------------
+  /**
+   * Receive resource from NGW by id, keyname or search-object parameter.
+   * @param resource - Resource id, keyname or search-object
+   *
+   * @remarks
+   * Fetching resource would be cached to speed up next call
+   */
+  getOne(resource, requestOptions) {
+    const opt = __spreadValues$u({}, requestOptions);
+    if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
+      if (resource.id !== void 0) {
+        resource.id;
+      } else {
+        if (resource.keyname) {
+          resource.keyname;
+        }
+        if (resource.display_name) {
+          resource.display_name;
+        }
+      }
+    }
+    if (typeof resource === "string") {
+      return this._fetchResourceBy({ keyname: resource }, opt);
+    } else if (typeof resource === "number") {
+      return this._fetchResourceById(resource, opt);
+    } else if (isObject(resource)) {
+      return this._fetchResourceBy(resource, opt);
+    }
+    return Promise.resolve(void 0);
+  }
+  getOneOrFail(resource, requestOptions) {
+    return this.getOne(resource, requestOptions).then((res) => {
+      if (res) {
+        return res;
+      }
+      throw new ResourceNotFoundError();
+    });
+  }
+  /**
+   * A fast way to retrieve resource ID for any resource definition.
+   * @param resource - Any available resource definition
+   *
+   * @remarks
+   * There are situations when exactly the resource id is needed
+   * (for example, to compose the correct request to the api)
+   * then this method will come in handy to facilitate the extraction of the identifier
+   * if the resource is specified through a keyname or other parameters.
+   */
+  getId(resource, requestOptions) {
+    if (typeof resource === "number") {
+      return Promise.resolve(resource);
+    } else if (typeof resource === "string" || isObject(resource)) {
+      return this.getOne(resource, requestOptions).then((res) => {
+        if (res) {
+          return res.resource.id;
+        }
+      });
+    }
+    return Promise.resolve(void 0);
+  }
+  /**
+   * A fast way to retrieve resource ID for any resource definition.
+   * @param resource - Any available resource definition
+   *
+   * @remarks
+   * Similar with {@link NgwConnector.getResourceId | getResourceId} but rise error if resource is not exist.
+   * To not make one more checks if the resource is definitely exists
+   */
+  getIdOrFail(resource, requestOptions) {
+    return this.getId(resource, requestOptions).then((resp) => {
+      if (resp === void 0) {
+        throw new Error();
+      }
+      return resp;
+    });
+  }
+  getMany(resource, requestOptions) {
+    return this._resourceCacheFilter(resource).then((items) => {
+      if (!items.length) {
+        const query = {};
+        if (resource.keyname) {
+          query.keyname = resource.keyname;
+        } else {
+          Object.assign(query, resourceToQuery(resource));
+        }
+        return this.connector.get("resource.search", requestOptions, __spreadValues$u({
+          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), {
+                id: x.resource.id
+              });
+            }
+          }
+          return resources;
+        });
+      }
+      return items;
+    });
+  }
+  getParent(resource, requestOptions) {
+    return this.getOne(resource, requestOptions).then((child) => {
+      if (child) {
+        return this.getOne(child.resource.parent.id, requestOptions);
+      }
+      return Promise.resolve(void 0);
+    });
+  }
+  getChildrenOf(resource, requestOptions) {
+    return this.getIdOrFail(resource).then(
+      (parent) => this._getChildrenOf(parent, requestOptions)
+    );
+  }
+  update(resource, data) {
+    return this.getId(resource).then((id) => {
+      if (id !== void 0) {
+        return this.connector.put("resource.item", { data }, { id });
+      }
+    });
+  }
+  /**
+   * Fast way to delete resource from NGW and clean cache.
+   * @param resource - Resource definition
+   */
+  delete(resource) {
+    return this.getId(resource).then((id) => {
+      if (id !== void 0) {
+        return this.connector.delete("resource.item", null, { id }).then(() => {
+          this._cleanResourceItemCache(id);
+          return void 0;
+        });
+      }
+    });
+  }
+  _getChildrenOf(parent, requestOptions, _items = []) {
+    return this.connector.get("resource.collection", requestOptions, {
+      parent
+    }).then((items) => {
+      const recursivePromises = [];
+      for (const item of items) {
+        if (requestOptions == null ? void 0 : requestOptions.cache) {
+          this.cache.add("resource.item", Promise.resolve(item), {
+            id: item.resource.id
+          });
+        }
+        _items.push(item);
+        if ((requestOptions == null ? void 0 : requestOptions.recursive) && item.resource.children) {
+          recursivePromises.push(
+            this._getChildrenOf(item.resource.id, requestOptions, _items)
+          );
+        }
+      }
+      if (recursivePromises.length) {
+        return Promise.all(recursivePromises).then(() => {
+          return _items;
+        });
+      }
+      return _items;
+    });
+  }
+  _cleanResourceItemCache(id) {
+    return __async$r(this, null, function* () {
+      var _a;
+      const all = this.cache.all();
+      const toDelete = [];
+      for (const c of all) {
+        const cid = (_a = c.props) == null ? void 0 : _a.id;
+        if (["resource.item", "resource"].includes(c.key) && cid !== void 0) {
+          if (typeof cid === "number") {
+            if (cid === id) {
+              toDelete.push(c);
+            }
+          } else {
+            const rid = yield this.getId(cid);
+            if (rid === id) {
+              toDelete.push(c);
+            }
+          }
+        }
+      }
+      for (const d of toDelete) {
+        this.cache.delete(d);
+      }
+    });
+  }
+  _fetchResourceById(id, requestOptions) {
+    return this.connector.get("resource.item", requestOptions, { id });
+  }
+  _fetchResourceBy(resource, requestOptions) {
+    return this.getMany(resource, requestOptions).then((resources) => {
+      return resources[0];
+    });
+  }
+  _resourceCacheFilter(resource) {
+    return Promise.all(this.cache.matchAll("resource.item")).then(
+      (resources) => {
+        const items = [];
+        resources.filter((x) => {
+          if (x) {
+            if (resource.keyname && x.resource.keyname) {
+              return resource.keyname === x.resource.keyname;
+            }
+            if (defined(resource.id) && defined(x.resource.id)) {
+              return resource.id === x.resource.id;
+            }
+            return resourceCompare(resource, x.resource);
+          }
+        });
+        return items;
+      }
+    );
+  }
+}
+
+var __defProp$F = Object.defineProperty;
+var __getOwnPropSymbols$u = Object.getOwnPropertySymbols;
+var __hasOwnProp$u = Object.prototype.hasOwnProperty;
+var __propIsEnum$u = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$t = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$u.call(b, prop))
+      __defNormalProp$F(a, prop, b[prop]);
+  if (__getOwnPropSymbols$u)
+    for (var prop of __getOwnPropSymbols$u(b)) {
+      if (__propIsEnum$u.call(b, prop))
+        __defNormalProp$F(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async$q = (__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$q(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]}`);
           }
         }
-      );
-    });
-  }
-  /**
-   * Quick way to change NextGIS Web user.
-   * @param credentials - New user credentials
-   */
-  login(credentials, options) {
-    this.logout();
-    addConnector(this);
-    return this._login(credentials, options);
-  }
-  /**
-   * Disconnecting a user. Aborting all current requests
-   */
-  logout() {
-    this.abort();
-    removeConnector(this);
-    this.options.auth = void 0;
-    this.user = void 0;
-    this.clearCache();
-    this.emitter.emit("logout");
-  }
-  getUserInfo(credentials, options) {
-    return __async$q(this, null, function* () {
-      if (this.user && this.user.id) {
-        return this.user;
+        if (paramArray.length) {
+          url = `${url}?${paramArray.join("&")}`;
+        }
       }
-      if (credentials) {
-        this.options.auth = credentials;
+      if (url) {
+        return connector.makeQuery(url, params, __spreadValues$t({
+          cacheName: name
+        }, requestOptions));
+      } else {
+        throw new Error("Request URL is not set");
       }
-      const options_ = __spreadValues$t({
-        headers: this.getAuthorizationHeaders(credentials)
-      }, options);
-      return this.makeQuery(
-        "/api/component/auth/current_user",
-        {},
-        options_
-      );
+    } else {
+      return void 0;
+    }
+  });
+}
+
+var __defProp$E = Object.defineProperty;
+var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$q = (obj, key, value) => __defNormalProp$E(obj, key + "" , value);
+class NgwConnectorExtended extends NgwConnector {
+  constructor(options) {
+    super(options);
+    __publicField$q(this, "resources");
+    this.resources = new ResourcesControl({
+      connector: this,
+      cacheId: options.cacheId
     });
   }
   /**
-   * Obtaining the required Headers for authentication of requests in the NGW.
+   * Clear the cache.
    */
-  getAuthorizationHeaders(credentials) {
-    const client = this.makeClientId(credentials);
-    if (client) {
-      return {
-        Authorization: `Basic ${client}`
-      };
-    }
-  }
-  makeClientId(credentials) {
-    credentials = credentials || this.options.auth;
-    if (credentials) {
-      const { login, password } = credentials;
-      const encodedStr = [login, password].map(encodeURIComponent).join(":");
-      {
-        return window.btoa(encodedStr);
-      }
-    }
-  }
-  /** Stop all api requests */
-  abort() {
-    for (const abortController of Object.values(this.activeRequests)) {
-      abortController.abort();
-    }
-    this.activeRequests = {};
-  }
-  getActiveApiRequests() {
-    return __spreadValues$t({}, this.activeRequests);
+  clearCache() {
+    super.clearCache();
+    this.resources.cache.clean();
   }
   /**
    * Send request to NGW api router.
@@ -1893,75 +2487,6 @@ class NgwConnector {
       options
     );
   }
-  /**
-   * Send request to NGW.
-   * @param url - URL address to NGW
-   * @param params - Query params
-   * @param options - Request options
-   */
-  makeQuery(_0, _1) {
-    return __async$q(this, arguments, function* (url, params, options = {}) {
-      var _b;
-      url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
-      if (!url) {
-        throw new Error("Empty `url` not allowed");
-      }
-      if (params) {
-        const _a = params, restParams = __objRest$3(_a, ["paramList"]);
-        url = template(url, restParams);
-      }
-      url = encodeURI(fixUrlStr(url));
-      options = __spreadValues$t({ withCredentials: this.withCredentials }, options);
-      const {
-        cache,
-        signal: externalSignal,
-        method = "GET",
-        headers,
-        cacheName,
-        cacheProps,
-        responseType,
-        withCredentials
-      } = options;
-      const internalAbortController = new AbortController();
-      const internalSignal = internalAbortController.signal;
-      if (externalSignal) {
-        if (externalSignal.aborted) {
-          throw new AbortError();
-        }
-        externalSignal.addEventListener("abort", () => {
-          internalAbortController.abort();
-        });
-      }
-      options.signal = internalSignal;
-      const createPromise = () => __async$q(this, null, function* () {
-        const id = REQUEST_ID++;
-        this.activeRequests[id] = internalAbortController;
-        try {
-          return this._loadData(url, options);
-        } finally {
-          this._cleanActiveRequest(id);
-        }
-      });
-      if (cache && method === "GET") {
-        const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$t({}, objectRemoveEmpty({
-          headers,
-          withCredentials,
-          responseType,
-          baseUrl: this.options.baseUrl,
-          userId: (_b = this.user) == null ? void 0 : _b.id
-        })), {
-          params
-        });
-        return this.cache.add(
-          cacheName || url,
-          createPromise,
-          cacheOptions,
-          false
-        );
-      }
-      return createPromise();
-    });
-  }
   // -------------------------------------------------------------------------
   // Resource Methods
   // -------------------------------------------------------------------------
@@ -2037,78 +2562,7 @@ class NgwConnector {
   deleteResource(resource) {
     return this.resources.delete(resource);
   }
-  /**
-   * @internal
-   */
-  _loadData(url, options) {
-    options.responseType = options.responseType || "json";
-    return new Promise((resolve, reject) => {
-      var _a;
-      if (this.user) {
-        options = options || {};
-        options.headers = __spreadValues$t(__spreadValues$t({}, this.getAuthorizationHeaders()), options.headers);
-      }
-      if (this.requestTransform) {
-        const [transUrl, transOptions] = this.requestTransform(url, options);
-        url = transUrl;
-        options = transOptions;
-      }
-      let runOnAbort = void 0;
-      loadData(url, resolve, options, reject, (handler) => {
-        runOnAbort = handler;
-      });
-      (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
-        if (runOnAbort !== void 0) {
-          runOnAbort();
-        }
-        reject(new AbortError());
-      });
-    }).catch((httpError) => {
-      if (httpError.name !== "AbortError") {
-        {
-          console.warn("DEV WARN", httpError);
-        }
-        const er = this._handleHttpError(httpError);
-        if (er) {
-          throw er;
-        }
-      }
-      throw httpError;
-    });
-  }
-  _login(credentials, options) {
-    return __async$q(this, null, function* () {
-      try {
-        const data = yield this.getUserInfo(credentials, options);
-        this.user = data;
-        this.emitter.emit("login", data);
-        return data;
-      } catch (er) {
-        this.emitter.emit("login:error", er);
-        throw er;
-      }
-    });
-  }
-  _cleanActiveRequest(requestId) {
-    delete this.activeRequests[requestId];
-  }
-  _handleHttpError(er) {
-    if (er) {
-      if (er instanceof NgwError) {
-        if (er.exception === "nextgisweb.resource.exception.ResourceNotFound") {
-          throw new ResourceNotFoundError(er);
-        } else if (er.exception === "nextgisweb.core.exception.InsufficientPermissions") {
-          throw new InsufficientPermissionsError(er);
-        }
-      }
-    }
-    return er;
-  }
 }
-__publicField$q(NgwConnector, "errors", {
-  NgwError,
-  ResourceNotFoundError
-});
 
 var __defProp$D = Object.defineProperty;
 var __getOwnPropSymbols$t = Object.getOwnPropertySymbols;
@@ -5301,7 +5755,6 @@ class NgwWebmapLayerAdapter {
     __publicField$c(this, "emitter", new EventEmitter());
     __publicField$c(this, "_extent");
     __publicField$c(this, "response");
-    __publicField$c(this, "_webmapLayersIds");
     __publicField$c(this, "_webmapBaselayersIds", []);
     __publicField$c(this, "_lastActiveBaselayer");
     const r = options.resourceId;
@@ -5346,7 +5799,6 @@ class NgwWebmapLayerAdapter {
     }
     delete this.layer;
     delete this.response;
-    delete this._webmapLayersIds;
   }
   showLayer() {
     return __async$a(this, null, function* () {
@@ -5437,26 +5889,19 @@ class NgwWebmapLayerAdapter {
   getIdentificationIds(options) {
     return __async$a(this, null, function* () {
       const visibleLayers = [];
-      let ids = this._webmapLayersIds;
-      if (!ids) {
-        ids = yield this._getWebMapIds(options);
-        this._webmapLayersIds = ids;
-      }
-      if (ids && ids.length) {
-        let deps = this.getDependLayers();
-        deps = deps.sort((a, b) => b.id - a.id);
-        deps.forEach((x) => {
-          const item = x.item;
-          const parentId = item.parentId;
-          if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
-            const visible = x.properties.property("visibility");
-            const isVisible = visible.get() && !visible.isBlocked();
-            if (isVisible) {
-              visibleLayers.push(parentId);
-            }
+      let deps = this.getDependLayers();
+      deps = deps.sort((a, b) => b.id - a.id);
+      deps.forEach((x) => {
+        const item = x.item;
+        const parentId = item.style_parent_id;
+        if (parentId !== void 0 && item.item_type === "layer" && item.layer_identifiable) {
+          const visible = x.properties.property("visibility");
+          const isVisible = visible.get() && !visible.isBlocked();
+          if (isVisible) {
+            visibleLayers.push(parentId);
           }
-        });
-      }
+        }
+      });
       return visibleLayers;
     });
   }
@@ -5585,31 +6030,6 @@ class NgwWebmapLayerAdapter {
     }
     return item;
   }
-  _getWebMapIds(options) {
-    return __async$a(this, null, function* () {
-      const webMapItem = this.layer;
-      if (webMapItem && webMapItem.item.item_type === "root") {
-        const layers = webMapItem.tree.getDescendants();
-        const promises = [];
-        for (const x of layers) {
-          const item = x.item;
-          if (item.item_type === "layer") {
-            const id = item.layer_style_id;
-            const promise = this.options.connector.getResource(id, options).then((y) => {
-              if (y) {
-                const parentId = Number(y.resource.parent.id);
-                item.parentId = parentId;
-                return parentId;
-              }
-            });
-            promises.push(promise);
-          }
-        }
-        const ids = yield Promise.all(promises);
-        return ids.filter((x) => x !== void 0);
-      }
-    });
-  }
 }
 
 var __defProp$h = Object.defineProperty;
@@ -5664,7 +6084,7 @@ class NgwKit {
       } else {
         throw new Error("url is not defined");
       }
-      this.connector = new NgwConnector({
+      this.connector = new NgwConnectorExtended({
         baseUrl: this.url,
         auth: this.options.auth
       });
@@ -9176,7 +9596,7 @@ function prepareWebMapOptions(options) {
     });
   }
   if (!options.connector) {
-    options.connector = new NgwConnector({
+    options.connector = new NgwConnectorExtended({
       baseUrl: options.baseUrl || "",
       auth: options.auth,
       withCredentials: options.withCredentials
@@ -9450,7 +9870,7 @@ const _NgwMap = class _NgwMap extends WebMap {
         if (mem.layer.getDependLayers) {
           const dependLayers = mem.layer.getDependLayers();
           const dependFit = dependLayers.find((x) => {
-            return x.item && x.item.parentId === id;
+            return x.item && x.item.style_parent_id === id;
           });
           if (dependFit) {
             return dependFit.layer;