Fixed a bug

Fixed a bug where members of model objects, which are themselves objects were not accessible in templates. Added a test case for that.

src/misc/ObjectModelAdaptor.ts

@@ -37,11 +37,7 @@ export class ObjectModelAdaptor implements ModelAdaptor<Constructor> {
 
         if (memberName in model) {
             // try for a visible field
-            const field = (model as never)[memberName];
-            if (typeof field !== "function" && typeof field !== "object") {
-                member = new Field(clazz, memberName);
-            }
-
+            member = new Field(clazz, memberName);
         }
 
         if (!member) {

tests/TestDictionaries.ts

@@ -325,6 +325,35 @@ export class TestDictionaries extends BaseTest {
         assertEquals(expected, result);
     }
 
+    @Test
+    public testAccessDictionaryFromParameter(): void {
+        const dir = this.tmpdir;
+        const g = `
+a(parser) ::= <<
+	<if(parser.tokens)>
+	public static final int
+		<parser.tokens:{k | <k>=<parser.tokens.(k)>}; separator=", ", wrap, anchor>;
+	<endif>
+>>`;
+        TestDictionaries.writeFile(dir, "g.stg", g);
+
+        const group = new STGroupFile(this.tmpdir + "/g.stg");
+        const st = group.getInstanceOf("a");
+
+        const parser = {
+            tokens: new Map<string, number>([
+                ["ID", 1],
+                ["INT", 2],
+                ["FLOAT", 3],
+            ]),
+        };
+        st?.add("parser", parser);
+
+        const expected = "\tpublic static final int\n\t\tID=1, INT=2, FLOAT=3;\n";
+        const result = st?.render();
+        assertEquals(expected, result);
+    }
+
     @Test
     public testAccessDictionaryFromAnonymousTemplateInRegion(): void {
         const dir = this.tmpdir;