@nextgis/geocoder 1.12.0 → 1.13.5

package/lib/geocoder.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.13.5; author: NextGIS */
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { objectAssign, fixUrlStr } from '@nextgis/utils';
 import NgwConnector from '@nextgis/ngw-connector';

package/lib/geocoder.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.13.5; author: NextGIS */
 var Geocoder = (function (exports) {
     'use strict';
 
@@ -1373,31 +1373,31 @@ var Geocoder = (function (exports) {
     /**
      * Thrown when...
      */
-    var NgwError = /** @class */ (function (_super) {
-        __extends(NgwError, _super);
-        function NgwError(er) {
+    var NetworkError = /** @class */ (function (_super) {
+        __extends(NetworkError, _super);
+        function NetworkError(url) {
             var _this = _super.call(this) || this;
-            _this.name = 'NgwError';
-            Object.assign(_this, er);
-            Object.setPrototypeOf(_this, NgwError.prototype);
+            _this.name = 'NetworkError';
+            Object.setPrototypeOf(_this, NetworkError.prototype);
+            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
             return _this;
         }
-        return NgwError;
+        return NetworkError;
     }(Error));
 
     /**
      * Thrown when...
      */
-    var NetworkError = /** @class */ (function (_super) {
-        __extends(NetworkError, _super);
-        function NetworkError(url) {
+    var NgwError = /** @class */ (function (_super) {
+        __extends(NgwError, _super);
+        function NgwError(er) {
             var _this = _super.call(this) || this;
-            _this.name = 'NetworkError';
-            Object.setPrototypeOf(_this, NetworkError.prototype);
-            _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
+            _this.name = 'NgwError';
+            Object.assign(_this, er);
+            Object.setPrototypeOf(_this, NgwError.prototype);
             return _this;
         }
-        return NetworkError;
+        return NgwError;
     }(Error));
 
     function isObject(val) {
@@ -1652,7 +1652,12 @@ var Geocoder = (function (exports) {
                 forCache.id = resource;
             }
             else if (isObject(resource)) {
-                forCache.id = resource.id;
+                if (resource.id !== undefined) {
+                    forCache.id = resource.id;
+                }
+                else if (resource.keyname) {
+                    forCache.keyname = resource.keyname;
+                }
             }
             var makeRequest = function () {
                 if (typeof resource === 'string') {
@@ -1754,20 +1759,35 @@ var Geocoder = (function (exports) {
         };
         ResourcesControl.prototype.getChildrenOf = function (resource, requestOptions) {
             var _this = this;
-            return this.getId(resource).then(function (parent) {
-                return _this.connector
-                    .get('resource.collection', __assign({ cache: true }, requestOptions), {
-                    parent: parent,
-                })
-                    .then(function (items) {
-                    for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-                        var i = items_1[_i];
-                        _this.cache.add('resource.item', CancelablePromise.resolve(i), {
-                            id: i.resource.id,
-                        });
+            return this.getIdOrFail(resource).then(function (parent) {
+                return _this._getChildrenOf(parent, requestOptions);
+            });
+        };
+        ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
+            var _this = this;
+            if (_items === void 0) { _items = []; }
+            return this.connector
+                .get('resource.collection', __assign({ cache: true }, requestOptions), {
+                parent: parent,
+            })
+                .then(function (items) {
+                var recursivePromises = [];
+                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
+                    var item = items_1[_i];
+                    _this.cache.add('resource.item', CancelablePromise.resolve(item), {
+                        id: item.resource.id,
+                    });
+                    _items.push(item);
+                    if ((requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.recursive) && item.resource.children) {
+                        recursivePromises.push(_this._getChildrenOf(item.resource.id, requestOptions, _items));
                     }
-                    return items;
-                });
+                }
+                if (recursivePromises.length) {
+                    return CancelablePromise.all(recursivePromises).then(function () {
+                        return _items;
+                    });
+                }
+                return _items;
             });
         };
         ResourcesControl.prototype.update = function (resource, data) {
@@ -1941,6 +1961,7 @@ var Geocoder = (function (exports) {
             this.id = ID++;
             this.emitter = new events.exports.EventEmitter();
             this.routeStr = '/api/component/pyramid/route';
+            this.activeRequests = [];
             var exist = findConnector(options);
             if (exist) {
                 return exist;
@@ -2026,6 +2047,7 @@ var Geocoder = (function (exports) {
          * Disconnecting a user. Aborting all current requests
          */
         NgwConnector.prototype.logout = function () {
+            this.abort();
             removeConnector(this);
             this.options.auth = undefined;
             this.user = undefined;
@@ -2078,6 +2100,17 @@ var Geocoder = (function (exports) {
                 }
             }
         };
+        /** Stop all api requests */
+        NgwConnector.prototype.abort = function () {
+            for (var _i = 0, _a = this.activeRequests; _i < _a.length; _i++) {
+                var req = _a[_i];
+                req.cancel();
+            }
+            this.activeRequests = [];
+        };
+        NgwConnector.prototype.getActiveApiRequests = function () {
+            return __spreadArray([], this.activeRequests, true);
+        };
         /**
          * Send request to NGW api router.
          * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
@@ -2292,14 +2325,20 @@ var Geocoder = (function (exports) {
         NgwConnector.prototype._loadData = function (url, options) {
             var _this = this;
             options.responseType = options.responseType || 'json';
-            return new CancelablePromise(function (resolve, reject, onCancel) {
+            var request = new CancelablePromise(function (resolve, reject, onCancel) {
                 if (_this.user) {
                     options = options || {};
                     // options.withCredentials = true;
                     options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
                 }
                 loadData(url, resolve, options, reject, onCancel);
-            }).catch(function (httpError) {
+            })
+                .then(function (resp) {
+                _this._cleanActiveRequests(request);
+                return resp;
+            })
+                .catch(function (httpError) {
+                _this._cleanActiveRequests(request);
                 if (httpError instanceof CancelablePromise.CancelError) ;
                 else {
                     // @ts-ignore
@@ -2312,6 +2351,20 @@ var Geocoder = (function (exports) {
                     }
                 }
             });
+            if (options.signal &&
+                typeof options.signal.addEventListener === 'function') {
+                options.signal.addEventListener('abort', function () {
+                    request.cancel();
+                });
+            }
+            this.activeRequests.push(request);
+            return request;
+        };
+        NgwConnector.prototype._cleanActiveRequests = function (request) {
+            var activeRequestIndex = this.activeRequests.indexOf(request);
+            if (activeRequestIndex !== -1) {
+                this.activeRequests.splice(activeRequestIndex, 1);
+            }
         };
         NgwConnector.prototype._handleHttpError = function (er) {
             if (er) {