@teipublisher/pb-components 2.26.1-next.3 → 3.0.0-next-4.2

package/src/authority/anton.js

@@ -1,89 +1,89 @@
-import { Registry } from "./registry.js";
+import { Registry } from './registry.js';
 
 /**
  * Connector for the corporate archive of Georgfischer AG.
  */
 export class Anton extends Registry {
-    
-    constructor(configElem) {
-        super(configElem);
-        this._url = configElem.getAttribute('url') || `https://archives.georgfischer.com/api`;
-        this._api = configElem.getAttribute('api');
-        this._limit = configElem.getAttribute('limit') || 999999;
-        this._provider = configElem.getAttribute('provider') || configElem.getAttribute('connector')
-    }
+  constructor(configElem) {
+    super(configElem);
+    this._url = configElem.getAttribute('url') || `https://archives.georgfischer.com/api`;
+    this._api = configElem.getAttribute('api');
+    this._limit = configElem.getAttribute('limit') || 999999;
+    this._provider = configElem.getAttribute('provider') || configElem.getAttribute('connector');
+  }
 
-    async query(key) {
-        const results = [];
-     
-        const register = this.getRegister();
-        const url = `${this._url}/${register}?search=${encodeURIComponent(key)}&perPage=${this._limit}`;
-        const label = this.getLabelField();
-        return new Promise((resolve) => {
-            fetch(url)
-              .then(response => response.json())
-              .then(json => {
-                  if (!json.data) {
-                      resolve({
-                          totalItems: 0,
-                          items: []
-                      });
-                      return;
-                  }
-                json.data.forEach(item => {
-                    if ((this._register === 'organization' && item.authority_type === 'Person') ||
-                        (this._register === 'person' && item.authority_type !== 'Person')) {
-                      return;
-                    }
-                    const result = {
-                      register: this._register,
-                      id: (this._prefix ? `${this._prefix}-${item.id}` : item.id),
-                      label: item[label],
-                      details: `${item.id}`,
-                      link: `${this._url}/${register}/${item.id}`,
-                      strings: [item[label]],
-                      provider: this._provider
-                    };
-                    results.push(result);
-                });
-                resolve({
-                  totalItems: json.meta.total,
-                  items: results,
-                });
-              })
-              .catch((reason) => Promise.reject(reason));
-        })
-    }
+  async query(key) {
+    const results = [];
 
-    info(key, container) {
-      if (!key) {
-        return Promise.resolve({});
-      }
-      const id = this._prefix ? key.substring(this._prefix.length + 1) : key;
-      const label = this.getLabelField();
-      return new Promise((resolve) => {
-        this.getRecord(id)
+    const register = this.getRegister();
+    const url = `${this._url}/${register}?search=${encodeURIComponent(key)}&perPage=${this._limit}`;
+    const label = this.getLabelField();
+    return new Promise(resolve => {
+      fetch(url)
+        .then(response => response.json())
         .then(json => {
-          const died = json.data.death ? `† ${json.data.death}` : '';
-          const dates = json.data.birth ? `<p>* ${json.data.birth} ${died}</p>` : '';
-          const note = json.data.note_bio ? `<p>${json.data.note_bio}</p>` : '';
-          const output = `
+          if (!json.data) {
+            resolve({
+              totalItems: 0,
+              items: [],
+            });
+            return;
+          }
+          json.data.forEach(item => {
+            if (
+              (this._register === 'organization' && item.authority_type === 'Person') ||
+              (this._register === 'person' && item.authority_type !== 'Person')
+            ) {
+              return;
+            }
+            const result = {
+              register: this._register,
+              id: this._prefix ? `${this._prefix}-${item.id}` : item.id,
+              label: item[label],
+              details: `${item.id}`,
+              link: `${this._url}/${register}/${item.id}`,
+              strings: [item[label]],
+              provider: this._provider,
+            };
+            results.push(result);
+          });
+          resolve({
+            totalItems: json.meta.total,
+            items: results,
+          });
+        })
+        .catch(reason => Promise.reject(reason));
+    });
+  }
+
+  info(key, container) {
+    if (!key) {
+      return Promise.resolve({});
+    }
+    const id = this._prefix ? key.substring(this._prefix.length + 1) : key;
+    const label = this.getLabelField();
+    return new Promise(resolve => {
+      this.getRecord(id).then(json => {
+        const died = json.data.death ? `† ${json.data.death}` : '';
+        const dates = json.data.birth ? `<p>* ${json.data.birth} ${died}</p>` : '';
+        const note = json.data.note_bio ? `<p>${json.data.note_bio}</p>` : '';
+        const output = `
             <h3 class="label"><a href="https://${json.wikipediaURL}" target="_blank">${json.data[label]}</a></h3>
               ${dates}
               ${note}
           `;
-          container.innerHTML = output;
-          resolve({
-            id: (this._prefix ? `${this._prefix}-${json.data.id}` : json.data.id),
-            strings: [json.data[label]]
-          });
+        container.innerHTML = output;
+        resolve({
+          id: this._prefix ? `${this._prefix}-${json.data.id}` : json.data.id,
+          strings: [json.data[label]],
         });
       });
-    }
+    });
+  }
 
-    /**
+  /**
    * Retrieve a raw JSON record for the given key as returned by the endpoint.
-   * 
+   *
    * @param {string} key the key to look up
    * @returns {Promise<any>} promise resolving to the JSON record returned by the endpoint
    */
@@ -91,68 +91,68 @@ export class Anton extends Registry {
     const id = key.replace(/^.*-([^-]+)$/, '$1');
     const url = `${this._url}/${this.getRegister()}/${id}`;
     return fetch(url)
-    .then(response => response.json())
-    .then(json => {
-      const output = Object.assign({}, json);
-      output.name = json.data[this.getLabelField()];
-      switch (this._register) {
-        case 'place':
-          output.country = json.data.country;
-          if (json.data.location && json.data.location.coordinates) {
-            output.location = json.data.location.coordinates;
-          }
-          output.links = json.data.links.map((link) => link.url);
-          break;
-        case 'person':
-          output.birth = json.data.birth;
-          output.death = json.data.death;
-          output.note = json.data.note_bio;
-          output.links = [`https://${json.wikipediaURL}`];
-          break;
-        default:
-          break;
-      }
-      return output;
-    })
-    .catch((reason) => Promise.reject(reason));
+      .then(response => response.json())
+      .then(json => {
+        const output = { ...json };
+        output.name = json.data[this.getLabelField()];
+        switch (this._register) {
+          case 'place':
+            output.country = json.data.country;
+            if (json.data.location && json.data.location.coordinates) {
+              output.location = json.data.location.coordinates;
+            }
+            output.links = json.data.links.map(link => link.url);
+            break;
+          case 'person':
+            output.birth = json.data.birth;
+            output.death = json.data.death;
+            output.note = json.data.note_bio;
+            output.links = [`https://${json.wikipediaURL}`];
+            break;
+          default:
+            break;
+        }
+        return output;
+      })
+      .catch(reason => Promise.reject(reason));
   }
 
-    getLabelField() {
-      let label;
-      switch (this._register) {
-          case 'term':
-              label = 'label';
-              break;
-          default:
-              label = 'fullname';
-              break;
-      }
-      return label;
+  getLabelField() {
+    let label;
+    switch (this._register) {
+      case 'term':
+        label = 'label';
+        break;
+      default:
+        label = 'fullname';
+        break;
     }
+    return label;
+  }
 
-    getRegister() {
-      if (this._api) {
-        return this._api;
-      }
-      let register;
-      switch(this._register) {
-        case 'person':
-        case 'organization':
-          register = 'actors';
-          break;
-        case 'origPlace':
-        case 'place':
-          register = 'places';
-          break;
-        case 'term':
-          register = 'keywords';
-          break;
-        case 'abbreviation':
-          register = 'abbreviations';
-          break;
-        default:
-          register = this._register;
-      }
-      return register;
+  getRegister() {
+    if (this._api) {
+      return this._api;
     }
+    let register;
+    switch (this._register) {
+      case 'person':
+      case 'organization':
+        register = 'actors';
+        break;
+      case 'origPlace':
+      case 'place':
+        register = 'places';
+        break;
+      case 'term':
+        register = 'keywords';
+        break;
+      case 'abbreviation':
+        register = 'abbreviations';
+        break;
+      default:
+        register = this._register;
+    }
+    return register;
+  }
 }

package/src/authority/custom.js

@@ -1,15 +1,58 @@
 import { Registry } from './registry.js';
-// eslint-disable-next-line import/no-cycle
-import { createConnectors } from './connectors.js';
+// Break circular dep: inline a minimal factory for nested connectors
+import { Metagrid } from './metagrid.js';
+import { GeoNames } from './geonames.js';
+import { Airtable } from './airtable.js';
+import { GND } from './gnd.js';
+import { KBGA } from './kbga.js';
+import { Anton } from './anton.js';
+import { ReconciliationService } from './reconciliation.js';
 
-export class Custom extends Registry {
+function createNestedConnectors(endpoint, root) {
+  const authorities = [];
+  root.querySelectorAll(':scope > pb-authority').forEach(configElem => {
+    const connector = configElem.getAttribute('connector');
+    let instance;
+    switch (connector) {
+      case 'GND':
+        instance = new GND(configElem);
+        break;
+      case 'GeoNames':
+        instance = new GeoNames(configElem);
+        break;
+      case 'Airtable':
+        instance = new Airtable(configElem);
+        break;
+      case 'KBGA':
+        instance = new KBGA(configElem);
+        break;
+      case 'Anton':
+      case 'GF':
+        instance = new Anton(configElem);
+        break;
+      case 'ReconciliationService':
+        instance = new ReconciliationService(configElem);
+        break;
+      case 'Custom':
+        // Avoid recursive Custom-in-Custom to break cycles; ignore or warn
+        console.warn('Nested Custom connector ignored to avoid circular dependency');
+        return; // skip push
+      default:
+        instance = new Metagrid(configElem);
+        break;
+    }
+    authorities.push(instance);
+  });
+  return authorities;
+}
 
+export class Custom extends Registry {
   constructor(endpoint, configElem) {
     super(configElem);
     this._editable = configElem.hasAttribute('edit');
     this._endpoint = endpoint;
-    this._connectors = createConnectors(endpoint, configElem);
-    this._connectors.forEach((connector) => {
+    this._connectors = createNestedConnectors(endpoint, configElem);
+    this._connectors.forEach(connector => {
       connector.name = this.name;
     });
     console.log(
@@ -39,16 +82,15 @@ export class Custom extends Registry {
               label: item.label,
               link: item.link,
               details: item.details,
-              provider: 'local'
+              provider: 'local',
             });
             localResults.add(item.id);
           });
           let totalItems = json.length;
 
           for (const connector of this._connectors) {
-            // eslint-disable-next-line no-await-in-loop
             const dr = await connector.query(key);
-            results = results.concat(dr.items.filter((result) => !localResults.has(result.id)));
+            results = results.concat(dr.items.filter(result => !localResults.has(result.id)));
             totalItems += dr.totalItems;
           }
           resolve({
@@ -65,45 +107,44 @@ export class Custom extends Registry {
     }
     const id = key;
     return new Promise((resolve, reject) => {
-      fetch(`${this._endpoint}/api/register/${this._register}/${encodeURIComponent(id)}`)
-        .then(async (response) => {
+      fetch(`${this._endpoint}/api/register/${this._register}/${encodeURIComponent(id)}`).then(
+        async response => {
           if (response.ok) {
             const json = await response.json();
             container.innerHTML = json.details;
             resolve({
               id: json.id,
               strings: json.strings,
-              editable: this._editable
+              editable: this._editable,
             });
             return;
           }
           if (response.status === 404) {
             for (const connector of this._connectors) {
               try {
-                // eslint-disable-next-line no-await-in-loop
                 const cr = await connector.info(key, container);
                 if (cr) {
                   resolve(cr);
                 }
               } catch (e) {
                 // not found: continue
-              };
+              }
             }
           }
           reject();
-        });
+        },
+      );
     });
   }
 
   /**
-   * 
-   * @param {any} item 
+   *
+   * @param {any} item
    * @returns {Promise}
    */
   async select(item) {
     let entry;
     for (const connector of this._connectors) {
-      // eslint-disable-next-line no-await-in-loop
       entry = await connector.getRecord(item.id).catch(() => null);
       if (entry) {
         break;
@@ -112,16 +153,18 @@ export class Custom extends Registry {
     if (!entry) {
       return Promise.resolve(item);
     }
-    return fetch(`${this._endpoint}/api/register/${this._register}/${encodeURIComponent(item.id)}`, {
-      method: 'POST',
-      mode: "cors",
-			credentials: "same-origin",
-			headers: {
-				"Content-Type": "application/json",
-			},
-			body: JSON.stringify(entry),
-    })
-    .then((response) => {
+    return fetch(
+      `${this._endpoint}/api/register/${this._register}/${encodeURIComponent(item.id)}`,
+      {
+        method: 'POST',
+        mode: 'cors',
+        credentials: 'same-origin',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(entry),
+      },
+    ).then(response => {
       if (response.ok) {
         return response.json();
       }

package/src/authority/geonames.js

@@ -1,7 +1,6 @@
 import { Registry } from './registry.js';
 
 export class GeoNames extends Registry {
-
   constructor(configElem) {
     super(configElem);
     this.user = configElem.getAttribute('user');
@@ -26,7 +25,7 @@ export class GeoNames extends Registry {
               details: `${item.fcodeName} - ${item.adminName1}, ${item.countryName}`,
               link: `https://www.geonames.org/${item.geonameId}`,
               strings: [item.toponymName],
-              provider: 'geonames.org'
+              provider: 'geonames.org',
             };
             results.push(result);
           });
@@ -43,24 +42,25 @@ export class GeoNames extends Registry {
       return Promise.resolve({});
     }
     return new Promise((resolve, reject) => {
-      this.getRecord(key).then(json => {
-        if (json.status) {
-          reject(json.status.message);
-          return;
-        }
-        const output = `
+      this.getRecord(key)
+        .then(json => {
+          if (json.status) {
+            reject(json.status.message);
+            return;
+          }
+          const output = `
             <h3 class="label">
               <a href="${json.link}" target="_blank">${json.name}</a>
             </h3>
             <p class="fcode">${json.note} - ${json.region}, ${json.country}</p>
           `;
-        container.innerHTML = output;
-        resolve({
-          id: this._prefix ? `${this._prefix}-${json.geonameId}` : json.geonameId,
-          strings: [json.name],
-        });
-      })
-      .catch(() => reject());
+          container.innerHTML = output;
+          resolve({
+            id: this._prefix ? `${this._prefix}-${json.geonameId}` : json.geonameId,
+            strings: [json.name],
+          });
+        })
+        .catch(() => reject());
     });
   }
 
@@ -73,22 +73,28 @@ export class GeoNames extends Registry {
   async getRecord(key) {
     const id = this._prefix ? key.substring(this._prefix.length + 1) : key;
     return fetch(
-      `https://secure.geonames.org/getJSON?geonameId=${encodeURIComponent(id)}&username=${this.user}`,
-    ).then(response => {
-      if (response.ok) {
-        return response.json();
-      }
-      return Promise.reject(response.status);
-    })
-    .then((json) => {
-      const output = Object.assign({}, json);
-      output.name = json.toponymName;
-      output.country = json.countryName;
-      output.region = json.adminName1;
-      output.note = json.fcodeName;
-      output.links = [`https://www.geonames.org/${json.geonameId}`, `https://${json.wikipediaURL}`];
-      return output;
-    })
-    .catch(() => Promise.reject());
+      `https://secure.geonames.org/getJSON?geonameId=${encodeURIComponent(id)}&username=${
+        this.user
+      }`,
+    )
+      .then(response => {
+        if (response.ok) {
+          return response.json();
+        }
+        return Promise.reject(response.status);
+      })
+      .then(json => {
+        const output = { ...json };
+        output.name = json.toponymName;
+        output.country = json.countryName;
+        output.region = json.adminName1;
+        output.note = json.fcodeName;
+        output.links = [
+          `https://www.geonames.org/${json.geonameId}`,
+          `https://${json.wikipediaURL}`,
+        ];
+        return output;
+      })
+      .catch(() => Promise.reject());
   }
 }