wip: faff

Author: ca-d

demo/index.html

@@ -12,14 +12,14 @@
 
 <script type="module">
   import { newHasher } from '../dist/hash.js';
+  import { identity } from '@openenergytools/scl-lib';
 
 const scl1 = document.getElementById('scl1');
 const result = document.getElementById('result');
 
-const { hash, db, idDb } = newHasher();
+const { hash, db, eDb } = newHasher();
 
 function display(description) {
-  console.log('displaying', description);
   const elements = [];
       Object.entries(description).forEach(([key, value]) => {
         if (key.startsWith('@')) {
@@ -29,12 +29,11 @@
             const sum = document.createElement('summary');
             det.append(sum);
             const d = db[tag][hash];
-            sum.textContent = tag + ' ' + (idDb[hash] || ' ') + ' (' + hash + ')';
+            sum.textContent = tag + ' ' + (identity(eDb.h2e.get(hash)) || ' ') + ' (' + hash + ')';
             det.addEventListener('toggle', () => {if (det.children.length < 2) det.append(...display(db[tag][hash]))})
             elements.push(det);
           }
         } else if ( key === 'eNS') {
-        console.log('ens!', value);
             const det = document.createElement('details');
             const sum = document.createElement('summary');
             det.setAttribute('open', '');
@@ -76,7 +75,11 @@
 scl1.addEventListener('change', e => {
   for (const file of scl1.files) {
     file.text().then(text => {
+    const t0 = (new Date().getTime());
       console.log(hash(new DOMParser().parseFromString(text, 'application/xml').documentElement))
+    const t1 = (new Date().getTime());
+    console.warn((t1 - t0) / 60000, 'min')
+    console.warn((t1 - t0) / 1000, 'sec')
       Object.entries(db.SCL).forEach(([sclHash, description]) => {
         const details = document.createElement('details');
         const summary = document.createElement('summary');
@@ -90,12 +93,11 @@
               const det = document.createElement('details');
               const sum = document.createElement('summary');
               det.append(sum);
-              sum.textContent = tag + ' ' + (idDb[hash] || ' ') + ' (' + hash + ')';
-              det.addEventListener('toggle', () => {console.log('toggled!'); if (det.children.length < 2) det.append(...display(db[tag][hash]))})
+              sum.textContent = tag + ' ' + (identity(eDb.h2e.get(hash)) || ' ') + ' (' + hash + ')';
+              det.addEventListener('toggle', () => {if (det.children.length < 2) det.append(...display(db[tag][hash]))})
               details.append(det);
             }
           } else if ( key === 'eNS') {
-            console.log('ens!', value);
             const det = document.createElement('details');
             const sum = document.createElement('summary');
             det.setAttribute('open', '');

hash.ts

@@ -1,5 +1,4 @@
 import xxhash from "xxhash-wasm";
-import { identity } from "@openenergytools/scl-lib";
 
 const xxh = await xxhash();
 
@@ -56,9 +55,14 @@ const attributes: {
   defaults: { fc: "ST", timeout: 30 },
 };
 
+interface ElementDB {
+  e2h: WeakMap<Element, string>;
+  h2e: Map<string, Element>;
+}
+
 export function hasher(
   db: HashDB,
-  idDb: IdentityDB,
+  eDb: ElementDB,
   {
     ignoreAttrs = new Set([
       "desc",
@@ -176,18 +180,10 @@ export function hasher(
     return description;
   }
 
-  function describeDA(e: Element) {
-    const description = {
-      ...describeBDA(e),
-    } as Record<string, unknown>;
-
-    return description;
-  }
-
   const descriptions: Record<string, (e: Element) => object> = {
     AccessPoint: describeNaming,
     BDA: describeBDA,
-    DA: describeDA,
+    DA: describeBDA,
     DataTypeTemplates: describeNaming,
     DAType: describeNaming,
     DO: (e) => {
@@ -251,7 +247,8 @@ export function hasher(
     return describeNaming(e);
   }
 
-  function hash(e: Element) {
+  function hash(e: Element): string {
+    if (eDb.e2h.has(e)) return eDb.e2h.get(e)!;
     const tag =
       e.namespaceURI === e.ownerDocument.documentElement.namespaceURI
         ? e.localName
@@ -260,8 +257,9 @@ export function hasher(
     const digest = xxh.h64ToString(JSON.stringify(description));
     if (!(tag in db)) db[tag] = {};
     if (!(digest in db[tag])) db[tag][digest] = description;
-    if (!(digest in idDb)) {
-      idDb[digest] = identity(e);
+    if (!eDb.h2e.has(digest)) {
+      eDb.h2e.set(digest, e);
+      eDb.e2h.set(e, digest);
     }
     return digest;
   }
@@ -272,9 +270,9 @@ export function hasher(
 export function newHasher(options = {}): {
   hash: Hasher;
   db: HashDB;
-  idDb: IdentityDB;
+  eDb: ElementDB;
 } {
   const db: HashDB = {};
-  const idDb: IdentityDB = {};
-  return { hash: hasher(db, idDb, options), db, idDb };
+  const eDb: ElementDB = { e2h: new WeakMap(), h2e: new Map() };
+  return { hash: hasher(db, eDb, options), db, eDb };
 }