Merge remote-tracking branch 'origin/main' into ClassStatementsGetter…

…-rewrite

docs/use-cases/TwoKeyedMap.md

@@ -288,12 +288,23 @@ if (method.name === "keys") {
     LiteralTypeStructureImpl.get("string"),
     LiteralTypeStructureImpl.get("string"),
   ]);
+  continue;
 }
 ```
 
+Note I probably could've gotten away with replacing the `K` with `{ firstKey: string, secondKey: string }`.
+
 ### Other iterator methods
 
-### Methods taking arguments
+These already specify `IterableIterator<[K, V]>`.  I want `IterableIterator<[string, string, V]>`.  I think, from the keys example above, the solution for this should be obvious.
+
+The `values` method I don't need to adjust at all: `IterableIterator<V>`.  
+
+### The `forEach` method
+
+Here the adjustments are to the _arguments_ of `forEach` - and they're a little deeper for the first argument, which is a callback function.  So we'll be dealing with the `parameters` array property of the method signature.
+
+### Other methods taking arguments
 
 ## Creating the existing class structure
 

use-cases/build/StringStringMap.ts

@@ -101,7 +101,23 @@ export default class StringStringMap<V> {
           LiteralTypeStructureImpl.get("string"),
           LiteralTypeStructureImpl.get("string"),
         ]);
+        continue;
       }
+
+      if ((method.name === "entries") || (method.name === "[Symbol.iterator]")) {
+        const { returnTypeStructure } = method;
+        assert.equal(returnTypeStructure?.kind, TypeStructureKind.TypeArgumented, "Expected a type-argumented type.");
+        assert.equal(returnTypeStructure.objectType, LiteralTypeStructureImpl.get("IterableIterator"), "Expected an IterableIterator");
+        assert.equal(returnTypeStructure.childTypes.length, 1);
+
+        assert.equal(returnTypeStructure.childTypes[0].kind, TypeStructureKind.Tuple);
+        returnTypeStructure.childTypes[0].childTypes.splice(
+          0, 1, LiteralTypeStructureImpl.get("string"), LiteralTypeStructureImpl.get("string")
+        );
+        continue;
+      }
+
+
     }
   }