From 1f1ea2b8ba4b0a8b00e04c599bb69ec7eb4c2a24 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sat, 25 Nov 2023 01:39:34 -0700
Subject: [PATCH] f: refactor names

---
 _webi/build-classifier                        |  2 +-
 ...fetch-releases-and-assign-build-targets.js | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/_webi/build-classifier b/_webi/build-classifier
index 0a74ed3..df1fdd0 160000
--- a/_webi/build-classifier
+++ b/_webi/build-classifier
@@ -1 +1 @@
-Subproject commit 0a74ed372bf38cf8112d7d6f1cf8fcd486b893cc
+Subproject commit df1fdd0e578efa80cfed465052575924ec464d3d
diff --git a/_webi/fetch-releases-and-assign-build-targets.js b/_webi/fetch-releases-and-assign-build-targets.js
index 7a04cc4..efa69dd 100644
--- a/_webi/fetch-releases-and-assign-build-targets.js
+++ b/_webi/fetch-releases-and-assign-build-targets.js
@@ -353,18 +353,20 @@ async function pkgToTriples(name) {
       continue;
     }
 
-    let triplish = Triplet.toPattern(name, build, pkg);
-    if (!triplish) {
+    let pattern = Triplet.toPattern(name, build, pkg);
+    if (!pattern) {
       continue;
     }
 
     // {NAME}/{NAME}-{VER}-Windows-x86_64_v2-musl.exe =>
     //     {NAME}.windows.x86_64v2.musl.exe
-    let triplet = Triplet.normalize(triplish);
+    let terms = Triplet.patternToTerms(pattern);
 
-    triplet = Triplet.replaceTriples(name, build, triplet);
+    // {NAME}.windows.x86_64v2.musl.exe
+    //     windows-x86_64_v2-musl
+    let triplet = Triplet.replaceTriples(name, build, terms);
 
-    triples.push(triplish);
+    triples.push(triplet);
   }
 
   return triples;
@@ -380,20 +382,20 @@ function mustClassifyBuild(allTermsMap, termsUnusedMap, name, build, pkg) {
     process.exit(1);
   }
 
-  let terms = pattern.split(/[_\{\}\/\.\-]+/g);
-  for (let term of terms) {
+  let rawTerms = pattern.split(/[_\{\}\/\.\-]+/g);
+  for (let term of rawTerms) {
     delete termsUnusedMap[term];
     allTermsMap[term] = true;
   }
 
   // {NAME}/{NAME}-{VER}-Windows-x86_64_v2-musl.exe =>
   //     {NAME}.windows.x86_64v2.musl.exe
-  let triplet = Triplet.normalizePattern(pattern);
-  if (!triplet) {
-    throw new Error(`'${pattern}' was trimmed to ''`);
+  let terms = Triplet.patternToTerms(pattern);
+  if (!terms.length) {
+    throw new Error(`'${terms}' was trimmed to ''`);
   }
 
-  triplet = Triplet.replaceTriples(name, build, triplet);
+  let triplet = Triplet.termsToTriplet(name, build, terms);
   return triplet;
 }