Better config parse for better base URLs

Author: WebReflection

core.js.map

@@ -3,6 +3,18 @@ import { absoluteURL, resolve } from './utils.js';
 import { parse } from './toml.js';
 import { getJSON, getText } from './fetch-utils.js';
 
+export const getConfigURLAndType = config => {
+    // REQUIRES INTEGRATION TEST
+    /* c8 ignore start */
+    let type = '';
+    if (/\.(json|toml|txt)$/.test(config))
+        type = RegExp.$1;
+    else
+        config = './config.txt';
+    return [absoluteURL(config), type];
+    /* c8 ignore stop */
+};
+
 /**
  * Parse a generic config if it came from an attribute either as URL
  * or as a serialized string. In XWorker case, accepts a pre-defined
@@ -17,21 +29,19 @@ export const getRuntime = (id, config, options = {}) => {
     if (config) {
         // REQUIRES INTEGRATION TEST
         /* c8 ignore start */
-        if (config.endsWith('.json')) {
-            options = fetch(config).then(getJSON);
-            config = absoluteURL(config);
-        } else if (config.endsWith('.toml')) {
-            options = fetch(config).then(getText).then(parse);
-            config = absoluteURL(config);
-        } else if (!config.endsWith('.txt')) {
+        const [absolute, type] = getConfigURLAndType(config);
+        if (type === 'json') {
+            options = fetch(absolute).then(getJSON);
+        } else if (type === 'toml') {
+            options = fetch(absolute).then(getText).then(parse);
+        } else if (!type) {
             try {
                 options = JSON.parse(config);
             } catch (_) {
                 options = parse(config);
             }
-            // make the config a URL to be able to retrieve relative paths from it
-            config = absoluteURL('./config.txt');
         }
+        config = absolute;
         /* c8 ignore stop */
     }
     return resolve(options).then(options => interpreter[id](options, config));

docs/core.js

@@ -1,7 +1,8 @@
 import * as JSON from '@ungap/structured-clone/json';
 import coincident from 'coincident/window';
 import xworker from './xworker.js';
-import { assign, defineProperties, absoluteURL } from '../utils.js';
+import { getConfigURLAndType } from '../loader.js';
+import { assign, defineProperties } from '../utils.js';
 import { getText } from '../fetch-utils.js';
 import { Hook } from './hooks.js';
 
@@ -33,8 +34,7 @@ export default (...args) =>
         // provide a base url to fetch or load config files from a Worker
         // because there's no location at all in the Worker as it's embedded.
         // fallback to a generic, ignored, config.txt file to still provide a URL.
-        const { config: c } = options;
-        const config = absoluteURL(typeof c === 'string' ? c : './config.txt');
+        const [ config ] = getConfigURLAndType(options.config);
 
         const bootstrap = fetch(url)
             .then(getText)

docs/core.js.map

@@ -70,6 +70,6 @@
         "coincident": "^0.11.6"
     },
     "worker": {
-        "blob": "sha256-fXQ1VoH403DDslyuep/RYEL2i/xf/QhO9nPZ9neh3V8="
+        "blob": "sha256-su+ZGyxquPydhkn09WaMjWjvNQcTNH1HlrJpOs5r7K0="
     }
 }