geoserver-node-client 1.6.0 → 1.6.2

package/dist/src/layergroup.js

@@ -1,37 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+exports.default = void 0;
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _geoserver = require("./util/geoserver.js");
 var _about = _interopRequireDefault(require("./about.js"));
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Client for GeoServer layergroups
  *
  * @module LayerGroupClient
  */
-var LayerGroupClient = exports["default"] = /*#__PURE__*/function () {
+class LayerGroupClient {
   /**
    * Creates a GeoServer REST LayerGroupClient instance.
    *
    * @param {String} url The URL of the GeoServer REST API endpoint
    * @param {String} auth The Basic Authentication string
    */
-  function LayerGroupClient(url, auth) {
-    (0, _classCallCheck2["default"])(this, LayerGroupClient);
+  constructor(url, auth) {
     this.url = url;
     this.auth = auth;
   }
@@ -58,217 +47,130 @@ var LayerGroupClient = exports["default"] = /*#__PURE__*/function () {
    *
    * @returns {string} A string with layer group location or undefined if not found
    */
-  return (0, _createClass2["default"])(LayerGroupClient, [{
-    key: "create",
-    value: (function () {
-      var _create = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(workspace, layerGroupName, layers, layerGroupOptions) {
-        var options, publishedLayers, styles, _iterator, _step, l, body, response, grc, geoServerResponse, location;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              options = _objectSpread({
-                mode: 'SINGLE',
-                layerGroupTitle: '',
-                abstractTxt: '',
-                bounds: {
-                  minx: -180,
-                  maxx: -90,
-                  miny: 180,
-                  maxy: 90,
-                  crs: 'EPSG:4326'
-                }
-              }, layerGroupOptions);
-              publishedLayers = [];
-              styles = [];
-              _iterator = _createForOfIteratorHelper(layers);
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  l = _step.value;
-                  publishedLayers.push({
-                    '@type': 'layer',
-                    name: "".concat(workspace, ":").concat(l),
-                    href: "".concat(this.url, "/workspaces/").concat(workspace, "/layers/").concat(l, ".json")
-                  });
-                  // use default style by define empty string
-                  styles.push('');
-                }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
-              body = {
-                layerGroup: _objectSpread({
-                  name: layerGroupName,
-                  workspace: {
-                    name: workspace
-                  },
-                  publishables: {
-                    published: publishedLayers
-                  },
-                  styles: {
-                    style: styles
-                  }
-                }, options)
-              };
-              _context.next = 1;
-              return (0, _nodeFetch["default"])("".concat(this.url, "/workspaces/").concat(workspace, "/layergroups"), {
-                credentials: 'include',
-                method: 'POST',
-                headers: {
-                  Authorization: this.auth,
-                  'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(body)
-              });
-            case 1:
-              response = _context.sent;
-              if (response.ok) {
-                _context.next = 5;
-                break;
-              }
-              grc = new _about["default"](this.url, this.auth);
-              _context.next = 2;
-              return grc.exists();
-            case 2:
-              if (!_context.sent) {
-                _context.next = 3;
-                break;
-              }
-              return _context.abrupt("return");
-            case 3:
-              _context.next = 4;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 4:
-              geoServerResponse = _context.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 5:
-              // get resource location from response header
-              location = response.headers.get('location'); // return resource location
-              return _context.abrupt("return", location);
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function create(_x, _x2, _x3, _x4) {
-        return _create.apply(this, arguments);
+  async create(workspace, layerGroupName, layers, layerGroupOptions) {
+    const options = {
+      mode: 'SINGLE',
+      layerGroupTitle: '',
+      abstractTxt: '',
+      bounds: {
+        minx: -180,
+        maxx: -90,
+        miny: 180,
+        maxy: 90,
+        crs: 'EPSG:4326'
+      },
+      ...layerGroupOptions
+    };
+    const publishedLayers = [];
+    const styles = [];
+    for (const l of layers) {
+      publishedLayers.push({
+        '@type': 'layer',
+        name: `${workspace}:${l}`,
+        href: `${this.url}/workspaces/${workspace}/layers/${l}.json`
+      });
+      // use default style by define empty string
+      styles.push('');
+    }
+    const body = {
+      layerGroup: {
+        name: layerGroupName,
+        workspace: {
+          name: workspace
+        },
+        publishables: {
+          published: publishedLayers
+        },
+        styles: {
+          style: styles
+        },
+        ...options
       }
-      return create;
-    }()
-    /**
-     * Returns a GeoServer layergroup by the given workspace and layergroup name,
-     * e.g. "myWs:myLayergroup".
-     *
-     * @param {String} workspace The name of the workspace
-     * @param {String} layerGroupName The name of the layer group to query
-     *
-     * @throws Error if request fails
-     *
-     * @returns {Object} An object with layer group information or undefined if it cannot be found
-     */
-    )
-  }, {
-    key: "get",
-    value: (function () {
-      var _get = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(workspace, layerGroupName) {
-        var response, grc, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 1;
-              return (0, _nodeFetch["default"])("".concat(this.url, "/workspaces/").concat(workspace, "/layergroups/").concat(layerGroupName, ".json"), {
-                credentials: 'include',
-                method: 'GET',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context2.sent;
-              if (response.ok) {
-                _context2.next = 5;
-                break;
-              }
-              grc = new _about["default"](this.url, this.auth);
-              _context2.next = 2;
-              return grc.exists();
-            case 2:
-              if (!_context2.sent) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              _context2.next = 4;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 4:
-              geoServerResponse = _context2.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 5:
-              return _context2.abrupt("return", response.json());
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function get(_x5, _x6) {
-        return _get.apply(this, arguments);
+    };
+    const response = await (0, _nodeFetch.default)(`${this.url}/workspaces/${workspace}/layergroups`, {
+      credentials: 'include',
+      method: 'POST',
+      headers: {
+        Authorization: this.auth,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) {
+      const grc = new _about.default(this.url, this.auth);
+      if (await grc.exists()) {
+        // GeoServer exists, but requested item does not exist, we return empty
+        return;
+      } else {
+        // There was a general problem with GeoServer
+        const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+        throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
       }
-      return get;
-    }()
-    /**
-     * Updates an existing GeoServer layergroup
-     *
-     * @param {String} workspace The name of the workspace
-     * @param {String} layerName The name of the layergroup to update
-     * @param {Object} layerGroupDefinition The updated definiton of the layergroup
-     *
-     * @throws Error if request fails
-     */
-    )
-  }, {
-    key: "update",
-    value: (function () {
-      var _update = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(workspace, layerGroupName, layerGroupDefinition) {
-        var url, response, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              url = "".concat(this.url, "/workspaces/").concat(workspace, "/layergroups/").concat(layerGroupName, ".json");
-              _context3.next = 1;
-              return (0, _nodeFetch["default"])(url, {
-                credentials: 'include',
-                method: 'PUT',
-                headers: {
-                  Authorization: this.auth,
-                  'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(layerGroupDefinition)
-              });
-            case 1:
-              response = _context3.sent;
-              if (response.ok) {
-                _context3.next = 3;
-                break;
-              }
-              _context3.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context3.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 3:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function update(_x7, _x8, _x9) {
-        return _update.apply(this, arguments);
+    }
+    // get resource location from response header
+    const location = response.headers.get('location');
+
+    // return resource location
+    return location;
+  }
+
+  /**
+   * Returns a GeoServer layergroup by the given workspace and layergroup name,
+   * e.g. "myWs:myLayergroup".
+   *
+   * @param {String} workspace The name of the workspace
+   * @param {String} layerGroupName The name of the layer group to query
+   *
+   * @throws Error if request fails
+   *
+   * @returns {Object} An object with layer group information or undefined if it cannot be found
+   */
+  async get(workspace, layerGroupName) {
+    const response = await (0, _nodeFetch.default)(`${this.url}/workspaces/${workspace}/layergroups/${layerGroupName}.json`, {
+      credentials: 'include',
+      method: 'GET',
+      headers: {
+        Authorization: this.auth
       }
-      return update;
-    }())
-  }]);
-}();
+    });
+    if (!response.ok) {
+      const grc = new _about.default(this.url, this.auth);
+      if (await grc.exists()) {
+        // GeoServer exists, but requested item does not exist,  we return empty
+        return;
+      } else {
+        // There was a general problem with GeoServer
+        const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+        throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+      }
+    }
+    return response.json();
+  }
+
+  /**
+   * Updates an existing GeoServer layergroup
+   *
+   * @param {String} workspace The name of the workspace
+   * @param {String} layerName The name of the layergroup to update
+   * @param {Object} layerGroupDefinition The updated definiton of the layergroup
+   *
+   * @throws Error if request fails
+   */
+  async update(workspace, layerGroupName, layerGroupDefinition) {
+    const url = `${this.url}/workspaces/${workspace}/layergroups/${layerGroupName}.json`;
+    const response = await (0, _nodeFetch.default)(url, {
+      credentials: 'include',
+      method: 'PUT',
+      headers: {
+        Authorization: this.auth,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(layerGroupDefinition)
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+  }
+}
+exports.default = LayerGroupClient;