hal takes more options

Author: plehegar

charter-assistant.html

@@ -38,7 +38,7 @@ <h2>Interest Groups</h2>
     async function populate() {
         const wgs = [];
         const igs = [];
-        for await (const group of hal("groups", `${config.w3cAPI}/groups`, true)) {
+        for await (const group of hal("groups", `${config.w3cAPI}/groups`, { embed: true })) {
             if (group.type === "working group") {            
                 wgs.push({
                     name: group.name,

lib/2026.js

@@ -407,12 +407,12 @@ async function compute(group, template, deliverables, charter) {
         head.appendChild(scriptConfig);
         if (config.debug) console.log(config);
     }
-
+    
     // clean up if needed
     draft.querySelectorAll('.remove').forEach(s => s.remove());
-
+    
     status('Done. Get ready to review the charter draft.');
-
+    
     return draft;
 }
 
@@ -502,7 +502,7 @@ async function fetchGroupData() {
         if (url) {
             targetObject[targetProperty] = [];
             try {
-                const items = await hal(targetProperty, url, true, postFunction);
+                const items = await hal(targetProperty, url, { embed: true, adapter: postFunction, fetch: { signal: abortSignal() } } );
                 for await (const service of items) {
                     targetObject[targetProperty].push(service);
                 }
@@ -541,11 +541,11 @@ async function fetchGroupData() {
 async function w3cgroups() {
     const groups = [];
     async function* listGroups() {
-        for await (const v of hal("groups", `${config.w3cAPI}/groups`, true))
+        for await (const v of hal("groups", `${config.w3cAPI}/groups`, { embed: true }))
         yield v;
     }
     for await (const group of listGroups()) {
-    groups.push(group);
-  }
-  return groups;
+        groups.push(group);
+    }
+    return groups;
 }

lib/hal.js

@@ -10,31 +10,33 @@ import { json } from './fetch.js';
  *
  * @param {string} propertyTarget - The property name to extract from _embedded or _links.
  * @param {string} link - The initial API endpoint URL.
- * @param {boolean} embed - Whether to use embedded resources or links.
- * @param {Function} [objFct] - Optional function to transform each resource.
+ * @param {Object} [options={}] - Optional settings.
+ * @param {boolean} [options.embed=false] - Whether to use embedded resources.
+ * @param {Object} [options.fetch={}] - Custom fetch options.
+ * @param {Function} [options.adapter] - Optional function to transform each resource.
  * @yields {Object} The resources from the HAL API.
  */
 export
-async function* hal(propertyTarget, link, embed, objFct) {
+async function* hal(propertyTarget, link, options = {}) {
   while (true) {
     let apiURL = new URL(link);
-    if (embed === true) {
+    if (options.embed === true) {
       apiURL.searchParams.set("embed", "1"); // grab everything
     }
-    let data = await json(apiURL);
-    if (embed) {
+    let data = await json(apiURL, options.fetch);
+    if (options.embed) {
       for (const target of data._embedded[propertyTarget]) {
-        if (objFct) {
-          yield objFct(target);
+        if (options.adapter) {
+          yield options.adapter(target);
         } else {
           yield target;
         }
       }
     } else {
       if (data._links[propertyTarget]) {
         for (const target of data._links[propertyTarget]) {
-          if (objFct) {
-            yield objFct(target);
+          if (options.adapter) {
+            yield options.adapter(target);
           } else {
             yield target;
           }