feat: reject promises in case of response status different to 2xx

Author: javierbrea

.eslintrc.json

@@ -1,6 +1,7 @@
 {
   "env": {
-    "node": true
+    "node": true,
+    "es6": true
   },
   "parserOptions": { 
     "ecmaVersion": "2018",

CHANGELOG.md

@@ -6,10 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 ### Added
+- feat: Expose one different method for each action.
+- feat: Reject promises in case of status code different to 2xx
 ### Changed
 - feat: Update mocks-server dependencies to v2 beta versions and adapt routes and tests.
 ### Fixed
 ### Removed
+- feat: Make private entities
+### Breaking change
+- Removed previous entity-based methods
 
 ## [2.1.0] - 2020-12-26
 

index.js

@@ -1 +1,2 @@
+export { config } from "./src/entities";
 export * from "./src/methods";

src/entities.js

@@ -0,0 +1,141 @@
+import fetch from "cross-fetch";
+
+import {
+  DEFAULT_BASE_PATH,
+  SETTINGS,
+  ABOUT,
+  ALERTS,
+  MOCKS,
+  ROUTES,
+  ROUTES_VARIANTS,
+  MOCK_CUSTOM_ROUTES_VARIANTS,
+  LEGACY,
+  BEHAVIORS,
+  FIXTURES,
+} from "@mocks-server/admin-api-paths";
+
+const DEFAULT_OPTIONS = {
+  apiPath: DEFAULT_BASE_PATH,
+  baseUrl: "http://localhost:3100",
+};
+
+let configuration = {
+  ...DEFAULT_OPTIONS,
+};
+
+function handleResponse(res) {
+  if (res.status > 199 && res.status < 300) {
+    return res.json().catch(() => Promise.resolve());
+  }
+  return res.json().then((data) => {
+    return Promise.reject(new Error(data.message));
+  });
+}
+
+export function config(options) {
+  configuration = {
+    ...configuration,
+    ...options,
+  };
+}
+
+class Fetcher {
+  constructor(url, id) {
+    this._url = url;
+    this._id = id ? `/${encodeURIComponent(id)}` : "";
+  }
+
+  get url() {
+    return `${configuration.baseUrl}${configuration.apiPath}${this._url}${this._id}`;
+  }
+
+  _read() {
+    return fetch(this.url).then(handleResponse);
+  }
+
+  _patch(data) {
+    return fetch(this.url, {
+      method: "PATCH",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    }).then(handleResponse);
+  }
+
+  _delete() {
+    return fetch(this.url, {
+      method: "DELETE",
+    }).then(handleResponse);
+  }
+
+  _create(data) {
+    return fetch(this.url, {
+      method: "POST",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    }).then(handleResponse);
+  }
+
+  read() {
+    return this._read();
+  }
+
+  update(data) {
+    return this._patch(data);
+  }
+
+  delete() {
+    return this._delete();
+  }
+
+  create(data) {
+    return this._create(data);
+  }
+}
+
+export const about = new Fetcher(ABOUT);
+
+export const settings = new Fetcher(SETTINGS);
+
+export const alerts = new Fetcher(ALERTS);
+
+export const alert = (id) => {
+  return new Fetcher(ALERTS, id);
+};
+
+export const mocks = new Fetcher(MOCKS);
+
+export const mock = (id) => {
+  return new Fetcher(MOCKS, id);
+};
+
+export const routes = new Fetcher(ROUTES);
+
+export const route = (id) => {
+  return new Fetcher(ROUTES, id);
+};
+
+export const routesVariants = new Fetcher(ROUTES_VARIANTS);
+
+export const routeVariant = (id) => {
+  return new Fetcher(ROUTES_VARIANTS, id);
+};
+
+export const mockCustomRoutesVariants = new Fetcher(MOCK_CUSTOM_ROUTES_VARIANTS);
+
+// legacy methods
+
+export const behaviors = new Fetcher(`${LEGACY}/${BEHAVIORS}`);
+
+export const behavior = (name) => {
+  return new Fetcher(`${LEGACY}/${BEHAVIORS}`, name);
+};
+
+export const fixtures = new Fetcher(`${LEGACY}/${FIXTURES}`);
+
+export const fixture = (id) => {
+  return new Fetcher(`${LEGACY}/${FIXTURES}`, id);
+};

src/methods.js

@@ -1,86 +1,93 @@
-import fetch from "cross-fetch";
-
 import {
-  DEFAULT_BASE_PATH,
-  SETTINGS,
-  ABOUT,
-  ALERTS,
-  /* MOCKS,
-  ROUTES,
-  ROUTES_VARIANTS,
-  MOCK_CUSTOM_ROUTES_VARIANTS, */
-  LEGACY,
-  BEHAVIORS,
-  FIXTURES,
-} from "@mocks-server/admin-api-paths";
-
-const DEFAULT_OPTIONS = {
-  apiPath: DEFAULT_BASE_PATH,
-  baseUrl: "http://localhost:3100",
-};
-
-let configuration = {
-  ...DEFAULT_OPTIONS,
-};
-
-export const config = (options) => {
-  configuration = {
-    ...configuration,
-    ...options,
-  };
-};
-
-class Fetcher {
-  constructor(url, id) {
-    this._url = url;
-    this._id = id ? `/${encodeURIComponent(id)}` : "";
-  }
-
-  get url() {
-    return `${configuration.baseUrl}${configuration.apiPath}${this._url}${this._id}`;
-  }
-
-  _read() {
-    return fetch(this.url).then((res) => res.json());
-  }
-
-  _patch(data) {
-    return fetch(this.url, {
-      method: "PATCH",
-      body: JSON.stringify(data),
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
-  }
-
-  read() {
-    return this._read();
-  }
-
-  update(data) {
-    return this._patch(data);
-  }
-}
-
-export const about = new Fetcher(ABOUT);
-
-export const settings = new Fetcher(SETTINGS);
-
-export const behaviors = new Fetcher(`${LEGACY}/${BEHAVIORS}`);
-
-export const behavior = (name) => {
-  return new Fetcher(`${LEGACY}/${BEHAVIORS}`, name);
-};
-
-export const fixtures = new Fetcher(`${LEGACY}/${FIXTURES}`);
-
-export const fixture = (id) => {
-  return new Fetcher(`${LEGACY}/${FIXTURES}`, id);
-};
-
-export const alerts = new Fetcher(ALERTS);
-
-export const alert = (id) => {
-  return new Fetcher(ALERTS, id);
-};
+  about,
+  behaviors,
+  behavior,
+  fixtures,
+  fixture,
+  settings,
+  alerts,
+  alert,
+  mocks,
+  mock,
+  routes,
+  route,
+  routesVariants,
+  routeVariant,
+  mockCustomRoutesVariants,
+} from "./entities";
+
+export function readAbout() {
+  return about.read();
+}
+
+export function readSettings() {
+  return settings.read();
+}
+
+export function updateSettings(newSettings) {
+  return settings.update(newSettings);
+}
+
+export function readAlerts() {
+  return alerts.read();
+}
+
+export function readAlert(id) {
+  return alert(id).read();
+}
+
+export function readMocks() {
+  return mocks.read();
+}
+
+export function readMock(id) {
+  return mock(id).read();
+}
+
+export function readRoutes() {
+  return routes.read();
+}
+
+export function readRoute(id) {
+  return route(id).read();
+}
+
+export function readRoutesVariants() {
+  return routesVariants.read();
+}
+
+export function readRouteVariant(id) {
+  return routeVariant(id).read();
+}
+
+export function readMockCustomRoutesVariants() {
+  return mockCustomRoutesVariants.read();
+}
+
+export function addMockCustomRouteVariant(id) {
+  return mockCustomRoutesVariants.create({
+    id,
+  });
+}
+
+export function restoreMockRoutesVariants() {
+  return mockCustomRoutesVariants.delete();
+}
+
+// legacy
+
+export function readBehaviors() {
+  return behaviors.read();
+}
+
+export function readBehavior(name) {
+  return behavior(name).read();
+}
+
+export function readFixtures() {
+  return fixtures.read();
+}
+
+export function readFixture(id) {
+  return fixture(id).read();
+}