Move fetchText to data.js

Also: fetchText now shares a backing helper function with fetchData. This avoids code repetition and helps fetchText handle more edge cases.

Author: Lucca-mito

src/utils/custom-scripts.js

@@ -8,14 +8,14 @@
  * See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import fetchText from 'docc-render/utils/fetch-text';
 import {
   copyPresentProperties,
   copyPropertyIfPresent,
   has,
   mustNotHave,
 } from 'docc-render/utils/object-properties';
 import { resolveAbsoluteUrl } from 'docc-render/utils/url-helper';
+import { fetchText } from 'docc-render/utils/data';
 
 /** Enum for the allowed values of the `run` property in a custom script. */
 const Run = {
@@ -135,7 +135,7 @@ async function evalScript(customScript) {
 
     if (has(customScript, 'integrity')) {
       // External script with integrity. Must also use CORS.
-      codeToEval = await fetchText(customScript.url, {
+      codeToEval = await fetchText(customScript.url, {}, {
         integrity: customScript.integrity,
         crossOrigin: 'anonymous',
       });
@@ -150,7 +150,7 @@ async function evalScript(customScript) {
 
     if (has(customScript, 'integrity')) {
       // Local script with integrity. Do not use CORS.
-      codeToEval = await fetchText(url, { integrity: customScript.integrity });
+      codeToEval = await fetchText(url, {}, { integrity: customScript.integrity });
     } else {
       // Local script without integrity.
       codeToEval = await fetchText(url);

src/utils/data.js

@@ -16,7 +16,7 @@ import emitWarningForSchemaVersionMismatch from 'docc-render/utils/schema-versio
 import RedirectError from 'docc-render/errors/RedirectError';
 import FetchError from 'docc-render/errors/FetchError';
 
-export async function fetchData(path, params = {}, options = {}) {
+async function safeFetch(path, params = {}, options = {}) {
   function isBadResponse(response) {
     // When this is running in an IDE target, the `fetch` API will be used with
     // custom URL schemes. Right now, WebKit will return successful responses
@@ -50,11 +50,35 @@ export async function fetchData(path, params = {}, options = {}) {
     });
   }
 
+  return response;
+}
+
+/**
+ * Fetch the contents of a file as an object.
+ * @param {string} path The file path.
+ * @param {any} params Object containing URL query parameters.
+ * @param {RequestInit} options Fetch options.
+ * @returns {Promise<any>} The contents of the file.
+ */
+export async function fetchData(path, params = {}, options = {}) {
+  const response = await safeFetch(path, params, options);
   const json = await response.json();
   emitWarningForSchemaVersionMismatch(json.schemaVersion);
   return json;
 }
 
+/**
+ * Fetch the contents of a file as text.
+ * @param {string} path The file path.
+ * @param {any} params Object containing URL query parameters.
+ * @param {RequestInit} options Fetch options.
+ * @returns {Promise<string>} The text contents of the file.
+ */
+export async function fetchText(path, params = {}, options = {}) {
+  const response = await safeFetch(path, params, options);
+  return response.text();
+}
+
 function createDataPath(path) {
   const dataPath = path.replace(/\/$/, '');
   return `${normalizePath(['/data', dataPath])}.json`;