Merge pull request #88 from dunglas/url

Improve the generated code by using the URL object

Author: dunglas

src/generators/BaseGenerator.js

@@ -2,7 +2,6 @@ import fs from "fs";
 import handlebars from "handlebars";
 import mkdirp from "mkdirp";
 import { sprintf } from "sprintf-js";
-import urlapi from "url";
 
 export default class {
   templates = {};
@@ -52,16 +51,8 @@ export default class {
     if (warn) console.log(`The file "${dest}" already exists`);
   }
 
-  createEntrypoint(apiEntry, dest) {
-    const url = urlapi.parse(apiEntry);
-    const { protocol, host, pathname } = url;
-
-    this.createFile(
-      "_entrypoint.js",
-      dest,
-      { host: `${protocol}//${host}`, path: pathname },
-      false
-    );
+  createEntrypoint(entrypoint, dest) {
+    this.createFile("_entrypoint.js", dest, { entrypoint }, false);
   }
 
   getHtmlInputTypeFromField(field) {

templates/_entrypoint.js

@@ -1,2 +1 @@
-export const API_HOST = '{{{host}}}'
-export const API_PATH = '{{{path}}}'
+export const API_ENTRYPOINT = '{{{entrypoint}}}';

templates/react-common/utils/fetch.js

@@ -1,19 +1,17 @@
 import { SubmissionError } from 'redux-form';
-import { API_HOST, API_PATH } from '../config/_entrypoint';
+import { API_ENTRYPOINT } from '../config/_entrypoint';
 
 const jsonLdMimeType = 'application/ld+json';
 
-export default function (url, options = {}) {
+export default function (id, options = {}) {
   if ('undefined' === typeof options.headers) options.headers = new Headers();
   if (null === options.headers.get('Accept')) options.headers.set('Accept', jsonLdMimeType);
 
   if ('undefined' !== options.body && !(options.body instanceof FormData) && null === options.headers.get('Content-Type')) {
     options.headers.set('Content-Type', jsonLdMimeType);
   }
 
-  const link = url.includes(API_PATH) ? API_HOST + url : API_HOST + API_PATH + url;
-
-  return fetch(link, options).then(response => {
+  return fetch(new URL(id, API_ENTRYPOINT).toString(), options).then(response => {
     if (response.ok) return response;
 
     return response

templates/react/utils/helpers.js

@@ -1,17 +1,18 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { API_PATH } from '../config/_entrypoint';
+import { API_ENTRYPOINT } from '../config/_entrypoint';
 
 export function itemToLinks(items) {
   return Array.isArray(items) ? items.map(item => createLink(item)) : createLink(items);
 }
 
 function createLink(item) {
-  if ('string' !== typeof(item) || !item.includes(API_PATH)) {
+  const apiPathname = (new URL(API_ENTRYPOINT).pathname);
+  if ('string' !== typeof(item) || !item.includes(apiPathname)) {
     return <div key={item}>{item}</div>;
   }
 
-  const routeWithoutPrefix = item.replace(API_PATH, '');
+  const routeWithoutPrefix = item.replace(apiPathname, '');
   const splittedRoute = routeWithoutPrefix.split('/');
   const route = '/' === routeWithoutPrefix[0] ? splittedRoute[1] : splittedRoute[0];
 

templates/vue/utils/fetch.js

@@ -1,9 +1,9 @@
 import SubmissionError from '../error/SubmissionError'
-import { API_HOST, API_PATH } from '../config/_entrypoint'
+import { API_ENTRYPOINT } from '../config/_entrypoint';
 
 const jsonLdMimeType = 'application/ld+json'
 
-export default function (url, options = {}) {
+export default function (id, options = {}) {
   if (typeof options.headers === 'undefined') Object.assign(options, { headers: new Headers() })
 
   if (options.headers.get('Accept') === null) options.headers.set('Accept', jsonLdMimeType)
@@ -12,9 +12,7 @@ export default function (url, options = {}) {
     options.headers.set('Content-Type', jsonLdMimeType)
   }
 
-  const link = url.includes(API_PATH) ? API_HOST + url : API_HOST + API_PATH + url
-
-  return fetch(link, options).then((response) => {
+  return fetch(new URL(id, API_ENTRYPOINT).toString(), options).then((response) => {
     if (response.ok) return response
 
     return response