Add CUtlHashtable and KeyValues3

Author: kristiker

scripts/find-missing-types.ts

@@ -12,18 +12,21 @@ const schemasDir = resolve(__dirname, "../schemas");
 
 const intrinsicNames = new Set(intrinsicDeclarations.keys());
 
+type MissingTypeInfo = { sources: Set<string>; count: number };
+
 function collectMissing(
   type: SchemaFieldType,
-  atomics: Map<string, Set<string>>,
-  declared: Map<string, Set<string>>,
+  atomics: Map<string, MissingTypeInfo>,
+  declared: Map<string, MissingTypeInfo>,
   knownKeys: Set<string>,
   source: string,
 ) {
   switch (type.category) {
     case "atomic":
       if (!intrinsicNames.has(type.name)) {
-        if (!atomics.has(type.name)) atomics.set(type.name, new Set());
-        atomics.get(type.name)!.add(source);
+        if (!atomics.has(type.name)) atomics.set(type.name, { sources: new Set(), count: 0 });
+        atomics.get(type.name)!.sources.add(source);
+        atomics.get(type.name)!.count++;
       }
       if (type.inner) collectMissing(type.inner, atomics, declared, knownKeys, source);
       if (type.inner2) collectMissing(type.inner2, atomics, declared, knownKeys, source);
@@ -32,8 +35,9 @@ function collectMissing(
     case "declared_enum": {
       const key = declarationKey(type.module, type.name);
       if (!knownKeys.has(key)) {
-        if (!declared.has(key)) declared.set(key, new Set());
-        declared.get(key)!.add(source);
+        if (!declared.has(key)) declared.set(key, { sources: new Set(), count: 0 });
+        declared.get(key)!.sources.add(source);
+        declared.get(key)!.count++;
       }
       break;
     }
@@ -47,8 +51,8 @@ function collectMissing(
   }
 }
 
-const missingAtomics = new Map<string, Set<string>>();
-const missingDeclared = new Map<string, Set<string>>();
+const missingAtomics = new Map<string, MissingTypeInfo>();
+const missingDeclared = new Map<string, MissingTypeInfo>();
 
 for (const game of GAME_LIST) {
   const data = await readGzippedJson<SchemasJson>(`${schemasDir}/${game.id}.json.gz`);
@@ -67,14 +71,14 @@ for (const game of GAME_LIST) {
   }
 }
 
-function printSection(title: string, entries: Map<string, Set<string>>) {
+function printSection(title: string, entries: Map<string, MissingTypeInfo>) {
   const sorted = [...entries.entries()].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
   if (sorted.length === 0) {
     console.log(`No ${title} found.`);
   } else {
     console.log(`${sorted.length} ${title}:\n`);
-    for (const [name, sources] of sorted) {
-      console.log(`  ${name}  [${[...sources].join(", ")}]`);
+    for (const [name, info] of sorted) {
+      console.log(`  (${info.count}) ${name}  [${[...info.sources].join(", ")}]`);
     }
   }
 }

src/data/intrinsics.ts

@@ -286,6 +286,62 @@ const types: IntrinsicDef[] = [
     ],
     size: 24,
   },
+  {
+    name: "CUtlHashtable",
+    fields: [
+      { name: "m_table", offset: 0, type: { category: "ptr", inner: b("void") } },
+      { name: "m_nUsed", offset: 24, type: b("int32") },
+      { name: "m_nTableSize", offset: 28, type: b("int32") },
+      { name: "m_nMinSize", offset: 32, type: b("int32") },
+      { name: "m_bSizeLocked", offset: 36, type: b("bool") },
+      { name: "m_eq", offset: 40, type: { category: "ptr", inner: b("void") } },
+      { name: "m_hash", offset: 48, type: { category: "ptr", inner: b("void") } },
+    ],
+    size: 56,
+  },
+
+  // ---- KeyValues3 types ----
+
+  {
+    // Other aliases: CKV3MemberNameSet
+    name: "KeyValues3", 
+    fields: [
+      { name: "m_bContextIndependent", offset: 0, type: bf(1) },
+      { name: "m_bFreeArrayMemory", offset: 0, type: bf(1) },
+      { name: "m_TypeEx", offset: 0, type: bf(8) },
+      { name: "m_SubType", offset: 0, type: bf(8) },
+      { name: "m_nFlags", offset: 0, type: bf(8) },
+      { name: "m_nClusterElement", offset: 0, type: bf(16) },
+      { name: "m_nNumArrayElements", offset: 0, type: bf(5) },
+      { name: "m_Data", offset: 8, type: b("uint64") },
+    ],
+    size: 16,
+  },
+  {
+    name: "CKeyValues3Array",
+    fields: [
+      { name: "m_nClusterElement", offset: 0, type: b("int32") },
+      { name: "m_nAllocatedChunks", offset: 4, type: b("int32") },
+      { name: "m_nCount", offset: 8, type: b("int32") },
+      { name: "m_nInitialSize", offset: 12, type: b("uint8") },
+      { name: "m_bIsDynamicallySized", offset: 13, type: b("bool") },
+      { name: "m_pDynamicElements", offset: 16, type: { category: "ptr", inner: b("void") } },
+    ],
+    size: 64,
+  },
+  {
+    name: "CKeyValues3Table",
+    fields: [
+      { name: "m_nClusterElement", offset: 0, type: b("int32") },
+      { name: "m_nAllocatedChunks", offset: 4, type: b("int32") },
+      { name: "m_pFastSearch", offset: 8, type: { category: "ptr", inner: b("void") } },
+      { name: "m_nCount", offset: 16, type: b("int32") },
+      { name: "m_nInitialSize", offset: 20, type: b("uint8") },
+      { name: "m_bIsDynamicallySized", offset: 21, type: b("bool") },
+      { name: "m_pDynamicBuffer", offset: 24, type: { category: "ptr", inner: b("void") } },
+    ],
+    size: 192,
+  },
 
   // ---- Resource / Handle types ----