@fraczak/k 6.1.2 → 6.1.3

package/codecs/BINARY_FORMAT.md

@@ -9,7 +9,7 @@ in [`POLYMORPHIC_BINARY_FORMAT.md`](./POLYMORPHIC_BINARY_FORMAT.md):
 encode($pattern_value : $pattern) encode(value : decoded_pattern)
 ```
 
-## Purpose Of This File
+## Purpose of This File
 
 This file records constraints for any future optimized container layered above
 the canonical stream.

package/codecs/POLYMORPHIC_BINARY_FORMAT.md

@@ -288,7 +288,7 @@ Decoding the stream yields `Value(pattern, tree)`. Encoding a runtime `Value`
 uses its carried pattern by default, or an explicit caller-supplied pattern when
 one is provided.
 
-## Out Of Scope For The Base Codec
+## Out of Scope for the Base Codec
 
 The following are intentionally outside the primitive codec:
 

package/codes.mjs

@@ -248,43 +248,24 @@ function finalizeIncremental(newCodes) {
     }
   }
 
-  const representatives = minimize(resolvedCodes).representatives;
-  for (const name in refResolution) {
-    if (refResolution[name] !== name) {
-      const target = refResolution[name];
-      representatives[name] = representatives[target] || target;
-    }
-  }
+  const reachableCodes = {};
+  const queue = Object.keys(resolvedCodes);
+  while (queue.length > 0) {
+    const name = queue.shift();
+    if (reachableCodes[name]) continue;
 
-  const normalizedCodes = normalizeAll(resolvedCodes, representatives);
-  const allReadableCodes = { ...theRepository.codes, ...normalizedCodes };
-  const globalNames = {};
+    const code = resolvedCodes[name] || theRepository.codes[name];
+    if (code == null) {
+      throw new Error(`Type references undefined type: ${name}`);
+    }
+    reachableCodes[name] = code;
 
-  for (const name in normalizedCodes) {
-    const globalDef = encodeCodeToString(name, allReadableCodes);
-    normalizedCodes[name].def = globalDef;
-    globalNames[name] = hash(globalDef);
+    for (const dest of Object.values(code[code.code] || {})) {
+      if (!reachableCodes[dest]) queue.push(dest);
+    }
   }
 
-  const globalCodes = Object.keys(normalizedCodes).reduce((result, name) => {
-    result[globalNames[name]] = normalizedCodes[name];
-    return result;
-  }, {});
-
-  const extendedRepresentatives = Object.keys(representatives).reduce((result, name) => {
-    result[name] = globalNames[representatives[name]] || representatives[name] || name;
-    return result;
-  }, {});
-
-  Object.values(globalNames).forEach((name) => {
-    extendedRepresentatives[name] = name;
-  });
-
-  const normalizedGlobalCodes = normalizeAll(globalCodes, extendedRepresentatives);
-  return {
-    codes: normalizedGlobalCodes,
-    representatives: extendedRepresentatives
-  };
+  return finalize(reachableCodes);
 }
 
 function register(newCodes) {

package/export.mjs

@@ -87,13 +87,13 @@ function theID(alias, rel, scc, name) {
         break;
       case "ref": {
         const n = rel.ref;
-        if (alias[n] != undefined) {
-          newRel.ref = alias[n];
-        } else if (auxNames[n] != undefined) {
+        if (auxNames[n] != undefined) {
           newRel.ref = auxNames[n];
         } else if (sccNames.has(n)) {
           auxNames[n] = `X${Object.keys(auxNames).length}`;
           newRel.ref = auxNames[n];
+        } else if (alias[n] != undefined) {
+          newRel.ref = alias[n];
         };
       }; break;
       default: