@cdktn/hcl2cdk 0.24.0-pre.5 → 0.24.0-pre.51

package/jest.config.js

@@ -2,17 +2,24 @@
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
+/* eslint-disable */
+const { readFileSync } = require('fs');
+
+const swcJestConfig = JSON.parse(
+  readFileSync(`${__dirname}/.spec.swcrc`, 'utf-8'),
+);
+
+swcJestConfig.swcrc = false;
 
 module.exports = {
-  testMatch: ['**/*.test.ts', '**/*.test.tsx'],
-  "transform": {
-    "^.+\\.tsx?$": "ts-jest"
+  displayName: '@cdktn/hcl2cdk',
+  preset: '../../../jest.preset.js',
+  rootDir: '.',
+  roots: ['<rootDir>'],
+  transform: {
+    '^.+\\.[tj]sx?$': ['@swc/jest', swcJestConfig],
   },
-  moduleFileExtensions: [
-    "js",
-    "ts",
-    "tsx"
-  ],
-  globalSetup: "./test/globalSetup.ts",
-  globalTeardown: "./test/globalTeardown.ts",
-}
+  globalSetup: './test/globalSetup.ts',
+  globalTeardown: './test/globalTeardown.ts',
+  coverageDirectory: 'test-output/jest/coverage',
+};

package/package.json

@@ -1,24 +1,12 @@
 {
   "name": "@cdktn/hcl2cdk",
-  "version": "0.24.0-pre.5",
+  "version": "0.24.0-pre.51",
   "description": "Transform HCL into CDK",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsc",
-    "watch": "tsc -w",
-    "watch-preserve-output": "tsc -w --preserveWatchOutput",
-    "test": "jest",
-    "test:ci": "jest --ci",
-    "test:update": "jest -u",
-    "jest-watch": "jest --watch",
-    "package": "./package.sh",
-    "dist-clean": "rm -rf dist",
-    "package:js": "./package.sh"
-  },
   "repository": {
     "type": "git",
     "url": "git://github.com/open-constructs/cdk-terrain.git",
@@ -40,32 +28,56 @@
     "@babel/generator": "7.29.1",
     "@babel/template": "7.28.6",
     "@babel/types": "7.29.0",
-    "@cdktn/commons": "0.24.0-pre.5",
-    "@cdktn/hcl2json": "0.24.0-pre.5",
-    "@cdktn/provider-generator": "0.24.0-pre.5",
-    "@cdktn/provider-schema": "0.24.0-pre.5",
     "camelcase": "6.3.0",
-    "cdktn": "0.24.0-pre.5",
     "codemaker": "1.128.0",
     "deep-equal": "2.2.3",
     "glob": "10.5.0",
     "graphology": "0.26.0",
     "graphology-types": "0.24.7",
-    "jsii-rosetta": "5.9.39",
+    "jsii-rosetta": "~5.9.0",
     "prettier": "2.8.8",
     "reserved-words": "0.1.2",
-    "zod": "3.25.76"
+    "zod": "3.25.76",
+    "@cdktn/commons": "0.24.0-pre.51",
+    "@cdktn/hcl2json": "0.24.0-pre.51",
+    "@cdktn/provider-generator": "0.24.0-pre.51",
+    "@cdktn/provider-schema": "0.24.0-pre.51",
+    "cdktn": "0.24.0-pre.51"
   },
   "devDependencies": {
+    "@types/babel__generator": "7.27.0",
+    "@types/babel__template": "7.4.4",
     "@types/deep-equal": "1.0.4",
-    "@types/jest": "30.0.0",
+    "@types/fs-extra": "11.0.4",
     "@types/node": "20.19.37",
     "@types/prettier": "2.7.3",
     "@types/reserved-words": "0.1.4",
     "execa": "5.1.1",
     "fs-extra": "11.3.4",
-    "jest": "^30.3.0",
-    "ts-jest": "29.4.9",
-    "typescript": "5.4.5"
+    "tsx": "4.6.1",
+    "typescript": "^5.0.0"
+  },
+  "nx": {
+    "tags": [
+      "unit-test"
+    ],
+    "targets": {
+      "test": {
+        "dependsOn": [
+          "build",
+          "^build",
+          "cdktn-cli:build"
+        ]
+      }
+    }
+  },
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc -w",
+    "watch-preserve-output": "tsc -w --preserveWatchOutput",
+    "test:update": "jest -u",
+    "package": "./package.sh",
+    "dist-clean": "rm -rf dist",
+    "package:js": "./package.sh"
   }
-}
+}

package/package.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 set -euo pipefail
-bundle=$(npm pack)
+bundle=$(pnpm pack | tail -n 1)
 rm -fr dist
 mkdir -p dist/js
 mv ${bundle} dist/js

package/src/__tests__/coerceType.test.ts

@@ -0,0 +1,207 @@
+// Copyright (c) HashiCorp, Inc
+// SPDX-License-Identifier: MPL-2.0
+import { coerceType } from "../coerceType";
+import template from "@babel/template";
+import generate from "@babel/generator";
+
+function expressionify(code: string) {
+  return (template.ast(code) as any).expression;
+}
+function generateCode(ast: any) {
+  return generate(ast).code;
+}
+
+const scope: any = {
+  importables: [],
+  variables: {
+    a_user_defined_variable: {
+      resource: "var",
+      variableName: "aUserDefinedVariable",
+    },
+    a_user_defined_local: {
+      resource: "var",
+      variableName: "aUserDefinedTerraformLocal",
+    },
+  },
+};
+
+describe("coerceType", () => {
+  it.each([
+    { code: `"hello-world"`, type: "string", targetType: undefined },
+    { code: `"hello-world"`, type: "string", targetType: "string" },
+  ])("should change nothing for %p ", ({ code, type, targetType }) => {
+    expect(
+      generateCode(
+        coerceType(scope, expressionify(code), type as any, targetType as any),
+      ),
+    ).toEqual(code);
+  });
+
+  it.each([
+    {
+      code: `"300"`,
+      type: "string",
+      targetType: "number",
+      expectedCode: `Token.asNumber("300")`,
+    },
+    {
+      code: `300`,
+      type: "number",
+      targetType: "string",
+      expectedCode: `Token.asString(300)`,
+    },
+    {
+      code: `"['foo', 'bar']"`,
+      type: "string",
+      targetType: ["list", "string"],
+      expectedCode: `Token.asList("['foo', 'bar']")`,
+    },
+    {
+      code: `"[1,2,3]"`,
+      type: "string",
+      targetType: ["list", "number"],
+      expectedCode: `Token.asNumberList("[1,2,3]")`,
+    },
+    {
+      code: `"['foo', 'bar']"`,
+      type: "string",
+      targetType: ["set", "string"],
+      expectedCode: `Token.asList("['foo', 'bar']")`,
+    },
+    {
+      code: `"[1,2,3]"`,
+      type: "string",
+      targetType: ["set", "number"],
+      expectedCode: `Token.asNumberList("[1,2,3]")`,
+    },
+    // We don't have a token function for boolean lists, so we need to take an asAny
+    {
+      code: `"[true,false,true]"`,
+      type: "string",
+      targetType: ["list", "bool"],
+      expectedCode: `Token.asAny("[true,false,true]")`,
+    },
+    {
+      code: `"{ foo: 'bar' }"`,
+      type: "string",
+      targetType: ["map", "string"],
+      expectedCode: `Token.asStringMap("{ foo: 'bar' }")`,
+    },
+    {
+      code: `"{ foo: 1 }"`,
+      type: "string",
+      targetType: ["map", "number"],
+      expectedCode: `Token.asNumberMap("{ foo: 1 }")`,
+    },
+
+    {
+      code: `"{ foo: true }"`,
+      type: "string",
+      targetType: ["map", "bool"],
+      expectedCode: `Token.asBooleanMap("{ foo: true }")`,
+    },
+
+    {
+      code: `"{ foo: {bar: true} }"`,
+      type: "string",
+      targetType: ["map", ["map", "boolean"]],
+      expectedCode: `Token.asAnyMap("{ foo: {bar: true} }")`,
+    },
+  ])(
+    "should use Token functions %p",
+    ({ code, type, targetType, expectedCode }) => {
+      expect(
+        generateCode(
+          coerceType(
+            scope,
+            expressionify(code),
+            type as any,
+            targetType as any,
+          ),
+        ),
+      ).toEqual(expectedCode);
+    },
+  );
+
+  it.each([
+    {
+      code: `aUserDefinedVariable.value`,
+      type: "dynamic",
+      targetType: "string",
+      expectedCode: `aUserDefinedVariable.stringValue`,
+    },
+    {
+      code: `aUserDefinedVariable.value`,
+      type: "dynamic",
+      targetType: "number",
+      expectedCode: `aUserDefinedVariable.numberValue`,
+    },
+    {
+      code: `aUserDefinedVariable.value`,
+      type: "dynamic",
+      targetType: ["list", "string"],
+      expectedCode: `aUserDefinedVariable.listValue`,
+    },
+    {
+      code: `aUserDefinedVariable.value`,
+      type: "dynamic",
+      targetType: "bool",
+      expectedCode: `aUserDefinedVariable.booleanValue`,
+    },
+  ])(
+    "should use TerraformVariables accessors %p",
+    ({ code, type, targetType, expectedCode }) => {
+      expect(
+        generateCode(
+          coerceType(
+            scope,
+            expressionify(code),
+            type as any,
+            targetType as any,
+          ),
+        ),
+      ).toEqual(expectedCode);
+    },
+  );
+
+  it.each([
+    {
+      code: `aUserDefinedTerraformLocal.value`,
+      type: "dynamic",
+      targetType: "string",
+      expectedCode: `aUserDefinedTerraformLocal.stringValue`,
+    },
+    {
+      code: `aUserDefinedTerraformLocal.value`,
+      type: "dynamic",
+      targetType: "number",
+      expectedCode: `aUserDefinedTerraformLocal.numberValue`,
+    },
+    {
+      code: `aUserDefinedTerraformLocal.value`,
+      type: "dynamic",
+      targetType: ["list", "string"],
+      expectedCode: `aUserDefinedTerraformLocal.listValue`,
+    },
+    {
+      code: `aUserDefinedTerraformLocal.value`,
+      type: "dynamic",
+      targetType: "bool",
+      expectedCode: `aUserDefinedTerraformLocal.booleanValue`,
+    },
+  ])(
+    "should use TerraformLocal accessors %p",
+    ({ code, type, targetType, expectedCode }) => {
+      expect(
+        generateCode(
+          coerceType(
+            scope,
+            expressionify(code),
+            type as any,
+            targetType as any,
+          ),
+        ),
+      ).toEqual(expectedCode);
+    },
+  );
+});