@cdktn/provider-generator 0.25.0-pre.6 → 0.25.0-pre.61

package/src/get/generator/resource-parser.ts

@@ -11,6 +11,7 @@ import {
   isAttributeNestedType,
   isNestedTypeAttribute,
   Schema,
+  TerraformTargetVersions,
 } from "@cdktn/commons";
 import { ProviderName, FQPN, parseFQPN } from "@cdktn/provider-schema";
 import {
@@ -82,8 +83,17 @@ export function sanitizeClassOrNamespaceName(
   isProvider = false,
 ) {
   const resourceIsNamedProvider = !isProvider && baseName === "provider";
-
-  if (isReservedClassOrNamespaceName(baseName) || resourceIsNamedProvider) {
+  // A resource named `<provider>_provider_functions` maps to the same
+  // providers/<provider>/provider-functions/ directory that the provider's
+  // functions submodule is emitted to, and would silently overwrite it.
+  const resourceIsNamedProviderFunctions =
+    !isProvider && baseName === "provider_functions";
+
+  if (
+    isReservedClassOrNamespaceName(baseName) ||
+    resourceIsNamedProvider ||
+    resourceIsNamedProviderFunctions
+  ) {
     return `${baseName}_resource`;
   } else {
     return baseName;
@@ -114,6 +124,7 @@ class Parser {
   constructor(
     private classNames: string[],
     private usedBaseNames: Map<string, string>,
+    private targetVersions?: TerraformTargetVersions,
   ) {}
 
   private uniqueClassName(className: string): string {
@@ -285,6 +296,7 @@ class Parser {
       terraformSchemaType,
       structs: this.structs,
       configStructName,
+      targetVersions: this.targetVersions,
     });
 
     return resourceModel;
@@ -718,6 +730,8 @@ export class ResourceParser {
   private uniqueBaseNames: Map<string, string> = new Map();
   private resources: Record<string, ResourceModel> = {};
 
+  constructor(private readonly targetVersions?: TerraformTargetVersions) {}
+
   public parse(
     fqpn: FQPN,
     type: string,
@@ -729,7 +743,11 @@ export class ResourceParser {
       return this.resources[type];
     }
 
-    const parser = new Parser(this.uniqueClassnames, this.uniqueBaseNames);
+    const parser = new Parser(
+      this.uniqueClassnames,
+      this.uniqueBaseNames,
+      this.targetVersions,
+    );
     const resource = parser.resourceFrom(
       fqpn,
       type,

package/tsconfig.json

@@ -24,6 +24,10 @@
     "stripInternal": true,
     "skipLibCheck": true,
     "target": "ES2018",
+    "types": [
+      "node",
+      "jest"
+    ],
     "incremental": true,
     "esModuleInterop": true,
     "rootDir": "./src",