prepare for nested object

Author: eduardomourar

.pylintrc

@@ -16,7 +16,7 @@ disable=
 
 [BASIC]
 
-good-names=e,ex,f,fp,i,j,k,n,_
+good-names=e,ex,f,fp,i,j,k,v,n,_
 
 [FORMAT]
 

python/rpdk/typescript/codegen.py

@@ -10,7 +10,7 @@
 from rpdk.core.jsonutils.resolver import ContainerType, resolve_models
 from rpdk.core.plugin_base import LanguagePlugin
 
-from .resolver import translate_type
+from .resolver import contains_model, translate_type
 from .utils import safe_reserved
 
 LOG = logging.getLogger(__name__)
@@ -41,6 +41,7 @@ def __init__(self):
             trim_blocks=True, lstrip_blocks=True, keep_trailing_newline=True
         )
         self.env.filters["translate_type"] = translate_type
+        self.env.filters["contains_model"] = contains_model
         self.env.filters["safe_reserved"] = safe_reserved
         self.env.globals["ContainerType"] = ContainerType
         self.namespace = None

python/rpdk/typescript/resolver.py

@@ -26,3 +26,9 @@ def translate_type(resolved_type):
         return f"Set<{item_type}>"
 
     raise ValueError(f"Unknown container type {resolved_type.container}")
+
+
+def contains_model(resolved_type):
+    if resolved_type.container == ContainerType.LIST:
+        return contains_model(resolved_type.type)
+    return resolved_type.container == ContainerType.MODEL

tests/plugin/resolver_test.py

@@ -1,6 +1,6 @@
 import pytest
 from rpdk.core.jsonutils.resolver import ContainerType, ResolvedType
-from rpdk.typescript.resolver import PRIMITIVE_TYPES, translate_type
+from rpdk.typescript.resolver import PRIMITIVE_TYPES, contains_model, translate_type
 
 RESOLVED_TYPES = [
     (ResolvedType(ContainerType.PRIMITIVE, item_type), native_type)
@@ -41,3 +41,16 @@ def test_translate_type_set(resolved_type, native_type):
 def test_translate_type_unknown(resolved_type, _typescript_type):
     with pytest.raises(ValueError):
         translate_type(ResolvedType("foo", resolved_type))
+
+
+@pytest.mark.parametrize("resolved_type,_native_type", RESOLVED_TYPES)
+def test_contains_model_list_containing_primitive(resolved_type, _native_type):
+    assert contains_model(ResolvedType(ContainerType.LIST, resolved_type)) is False
+
+
+def test_contains_model_list_containing_model():
+    resolved_type = ResolvedType(
+        ContainerType.LIST,
+        ResolvedType(ContainerType.LIST, ResolvedType(ContainerType.MODEL, "Foo")),
+    )
+    assert contains_model(resolved_type) is True