@nextgis/geocoder 1.12.0 → 1.12.1

package/lib/geocoder.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.12.1; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/geocoder.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 1.12.0; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 1.12.1; author: NextGIS */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -1508,6 +1508,11 @@ var loadData;
                 xhr.abort();
             });
         }
+        if (options.signal) {
+            options.signal.addEventListener('abort', function () {
+                xhr.abort();
+            });
+        }
         xhr.send(data);
     };
 }
@@ -1649,7 +1654,12 @@ var ResourcesControl = /** @class */ (function () {
             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') {
@@ -1751,20 +1761,35 @@ var ResourcesControl = /** @class */ (function () {
     };
     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) {