wip: show identity strings

Author: ca-d

demo/index.html

@@ -16,7 +16,7 @@
 const scl1 = document.getElementById('scl1');
 const result = document.getElementById('result');
 
-const { hash, db } = newHasher();
+const { hash, db, idDb } = newHasher();
 
 function display(description) {
   console.log('displaying', description);
@@ -29,18 +29,21 @@
             const sum = document.createElement('summary');
             det.append(sum);
             const d = db[tag][hash];
-            sum.textContent = tag + ' ' + hash;
+            sum.textContent = tag + ' ' + (idDb[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', '');
             det.append(sum);
             sum.textContent = 'extension NS';
             Object.entries(value).forEach(([ns, attrs]) => {
               const de = document.createElement('details');
               const su = document.createElement('summary');
+              de.setAttribute('open', '');
               de.append(su);
               su.textContent = ns;
               Object.entries(attrs).forEach(([a,v]) => {
@@ -53,7 +56,9 @@
                 val.textContent = v
                 de.append(val);
               })
+              det.append(de)
             })
+            elements.push(det);
         } else {
           const attr = document.createElement('div');
           attr.setAttribute('class','column');
@@ -85,31 +90,36 @@
               const det = document.createElement('details');
               const sum = document.createElement('summary');
               det.append(sum);
-              sum.textContent = tag + ' ' + hash;
+              sum.textContent = tag + ' ' + (idDb[hash] || hash);
               det.addEventListener('toggle', () => {console.log('toggled!'); if (det.children.length < 2) det.append(...display(db[tag][hash]))})
               details.append(det);
             }
           } else if ( key === 'eNS') {
-              const det = document.createElement('details');
-              const sum = document.createElement('summary');
-              det.append(sum);
-              sum.textContent = 'extension NS';
-              Object.entries(value).forEach(([ns, attrs]) => {
-                const de = document.createElement('details');
-                const su = document.createElement('summary');
-                de.append(su);
-                su.textContent = ns;
-                Object.entries(attrs).forEach(([a,v]) => {
-                  const attr = document.createElement('div');
-                  attr.setAttribute('class','column');
-                  attr.textContent = a
-                  de.append(attr);
-                  const val = document.createElement('div');
-                  val.setAttribute('class','column');
-                  val.textContent = v
-                  de.append(val);
-                })
+            console.log('ens!', value);
+            const det = document.createElement('details');
+            const sum = document.createElement('summary');
+            det.setAttribute('open', '');
+            det.append(sum);
+            sum.textContent = 'extension NS';
+            Object.entries(value).forEach(([ns, attrs]) => {
+              const de = document.createElement('details');
+              const su = document.createElement('summary');
+              de.setAttribute('open', '');
+              de.append(su);
+              su.textContent = ns;
+              Object.entries(attrs).forEach(([a,v]) => {
+                const attr = document.createElement('div');
+                attr.setAttribute('class','column');
+                attr.textContent = a
+                de.append(attr);
+                const val = document.createElement('div');
+                val.setAttribute('class','column');
+                val.textContent = v
+                de.append(val);
               })
+              det.append(de)
+            })
+            details.append(det);
           } else {
             const attr = document.createElement('div');
             attr.setAttribute('class','column');
@@ -130,8 +140,8 @@
 
 <style>
 body {
-  background: #ccc;
-  color: #222;
+  background: #edc;
+  color: #014;
   font-family: Roboto;
   font-weight: 300;
 }
@@ -142,7 +152,7 @@
   padding: 4px;
   opacity: 0.8;
   vertical-align: middle;
-  border: 1px #ccc solid;
+  border: 1px #edc solid;
   border-radius: 6px;
 }
 .column:nth-of-type(2n+1) {

hash.ts

@@ -1,8 +1,10 @@
 import xxhash from "xxhash-wasm";
+import { identity } from "@openenergytools/scl-lib";
 
 const xxh = await xxhash();
 
 export type HashDB = Record<string, Record<string, object>>;
+export type IdentityDB = Record<string, string | number>;
 export type Hasher = (e: Element) => string;
 
 const xmlTruths = new Set(["true", "1"]);
@@ -56,8 +58,18 @@ const attributes: {
 
 export function hasher(
   db: HashDB,
+  idDb: IdentityDB,
   {
-    ignoreAttrs = new Set(["desc", "id", "name", "type", "inst", "lnType"]),
+    ignoreAttrs = new Set([
+      "desc",
+      "id",
+      "name",
+      "DO.type",
+      "DA.type",
+      "BDA.type",
+      "inst",
+      "lnType",
+    ]),
     hashENS,
   }: { ignoreAttrs?: Set<string>; hashENS?: string[] } = {},
 ): (e: Element) => string {
@@ -69,6 +81,7 @@ export function hasher(
     Array.from(e.attributes)
       .map((a) => a.localName)
       .filter((a) => !ignoreAttrs.has(a))
+      .filter((a) => !ignoreAttrs.has(e.tagName + "." + a))
       .sort()
       .forEach((name) => {
         if (name in defaults) description[name] = defaults[name];
@@ -100,8 +113,8 @@ export function hasher(
       .map((c) => c.tagName)
       .filter((c, i, arr) => arr.indexOf(c) === i);
     const description: Record<string, unknown> = {
-      ...describeChildren(e, ...children),
       ...describeAttributes(e),
+      ...describeChildren(e, ...children),
     };
     const eNSAttrs = Array.from(e.attributes).filter((a) => a.namespaceURI);
     if (eNSAttrs.length) {
@@ -247,13 +260,21 @@ 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);
+    }
     return digest;
   }
 
   return hash;
 }
 
-export function newHasher(options = {}): { hash: Hasher; db: HashDB } {
+export function newHasher(options = {}): {
+  hash: Hasher;
+  db: HashDB;
+  idDb: IdentityDB;
+} {
   const db: HashDB = {};
-  return { hash: hasher(db, options), db };
+  const idDb: IdentityDB = {};
+  return { hash: hasher(db, idDb, options), db, idDb };
 }

package-lock.json

@@ -55,6 +55,7 @@
     "root": true
   },
   "dependencies": {
+    "@openenergytools/scl-lib": "^0.13.3",
     "xxhash-wasm": "^1.0.2"
   }
 }