chore: fix ts issues

hashicorp · Jan 23, 2024 · 6add110 · 6add110
1 parent eb1e14b
commit 6add110
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/@cdktf/hcl2cdk/lib/generation.ts b/packages/@cdktf/hcl2cdk/lib/generation.ts
@@ -107,7 +107,7 @@ export const valueToTs = async (
       }
 
       // For iterators and dynamic blocks we put the correct TS expression in the config ahead of time
-      if (t.isExpression(item)) {
+      if (t.isNode(item) && t.isExpression(item)) {
         return item;
       }
 
@@ -198,7 +198,7 @@ export const valueToTs = async (
               const shouldBeArray =
                 typeof value === "object" &&
                 !Array.isArray(value) &&
-                !t.isExpression(value) &&
+                !(t.isNode(value) && t.isExpression(value)) &&
                 !isSingleItemBlock &&
                 // Map type attributes must not be wrapped in arrays
                 !isMapAttribute(itemAttributeType) &&

diff --git a/packages/@cdktf/hcl2cdk/lib/partialCode.ts b/packages/@cdktf/hcl2cdk/lib/partialCode.ts
@@ -53,7 +53,8 @@ export function fillWithConfigAccessors(
       const value = mutated[key];
       const isNotDirectlyAccessible = value === undefined;
       const isReplacedByAst =
-        t.isExpression(mutated) || t.isExpression(value as any);
+        (t.isNode(mutated) && t.isExpression(mutated)) ||
+        t.isExpression(value as any);
       const isEmptyArray = Array.isArray(value) && value.length === 0;
 
       // If this was already replaced by an AST node, we don't need to do anything