@lightdash/cli 0.2038.1 → 0.2039.1

package/dist/dbt/context.js

@@ -7,6 +7,7 @@ const fs_1 = require("fs");
 const yaml = tslib_1.__importStar(require("js-yaml"));
 const path = tslib_1.__importStar(require("path"));
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
+const templating_1 = require("./templating");
 const getDbtContext = async ({ projectDir, initialProjectDir, }) => {
     globalState_1.default.debug(`> Loading dbt_project.yml file from: ${projectDir}`);
     const projectFilename = path.join(projectDir, 'dbt_project.yml');
@@ -25,7 +26,9 @@ const getDbtContext = async ({ projectDir, initialProjectDir, }) => {
         const msg = (0, common_1.getErrorMessage)(e);
         throw new common_1.ParseError(`Is ${initialProjectDir} a valid dbt project directory? Couldn't find a valid dbt_project.yml on ${initialProjectDir} or any of its parents:\n  ${msg}`);
     }
-    const config = yaml.load(file);
+    // Render Jinja templating (e.g., env_var) before parsing YAML
+    const renderedFile = (0, templating_1.renderProfilesYml)(file);
+    const config = yaml.load(renderedFile);
     const targetSubDir = config['target-path'] || './target';
     globalState_1.default.debug(`> dbt target directory: ${targetSubDir}`);
     const targetDir = path.join(projectDir, targetSubDir);

package/dist/dbt/context.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/dbt/context.test.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs_1 = require("fs");
+const os = tslib_1.__importStar(require("os"));
+const path = tslib_1.__importStar(require("path"));
+const context_1 = require("./context");
+describe('getDbtContext', () => {
+    const { env } = process;
+    let tempDir;
+    beforeEach(async () => {
+        jest.resetModules();
+        process.env = { ...env };
+        // Create a temporary directory for test files
+        tempDir = await fs_1.promises.mkdtemp(path.join(os.tmpdir(), 'dbt-context-test-'));
+    });
+    afterEach(async () => {
+        process.env = env;
+        // Clean up temporary directory
+        await fs_1.promises.rm(tempDir, { recursive: true, force: true });
+    });
+    describe('target-path with env_var templating', () => {
+        test('should resolve env_var in target-path', async () => {
+            process.env.DBT_ENV__TARGET_FOLDER = 'custom-target';
+            const dbtProjectContent = `name: test_project
+profile: test_profile
+target-path: "{{ env_var('DBT_ENV__TARGET_FOLDER', 'target') }}"
+models-path: "models"
+`;
+            await fs_1.promises.writeFile(path.join(tempDir, 'dbt_project.yml'), dbtProjectContent);
+            const context = await (0, context_1.getDbtContext)({ projectDir: tempDir });
+            expect(context.targetDir).toBe(path.join(tempDir, 'custom-target'));
+            expect(context.projectName).toBe('test_project');
+            expect(context.profileName).toBe('test_profile');
+        });
+        test('should use default value when env_var is not set', async () => {
+            const dbtProjectContent = `name: test_project
+profile: test_profile
+target-path: "{{ env_var('DBT_ENV__TARGET_FOLDER', 'target') }}"
+models-path: "models"
+`;
+            await fs_1.promises.writeFile(path.join(tempDir, 'dbt_project.yml'), dbtProjectContent);
+            const context = await (0, context_1.getDbtContext)({ projectDir: tempDir });
+            expect(context.targetDir).toBe(path.join(tempDir, 'target'));
+        });
+        test('should work with models-path env_var', async () => {
+            process.env.DBT_MODELS_PATH = 'custom-models';
+            const dbtProjectContent = `name: test_project
+profile: test_profile
+target-path: "target"
+models-path: "{{ env_var('DBT_MODELS_PATH', 'models') }}"
+`;
+            await fs_1.promises.writeFile(path.join(tempDir, 'dbt_project.yml'), dbtProjectContent);
+            const context = await (0, context_1.getDbtContext)({ projectDir: tempDir });
+            expect(context.modelsDir).toBe(path.join(tempDir, 'custom-models'));
+        });
+        test('should work without any templating', async () => {
+            const dbtProjectContent = `name: test_project
+profile: test_profile
+target-path: "target"
+models-path: "models"
+`;
+            await fs_1.promises.writeFile(path.join(tempDir, 'dbt_project.yml'), dbtProjectContent);
+            const context = await (0, context_1.getDbtContext)({ projectDir: tempDir });
+            expect(context.targetDir).toBe(path.join(tempDir, 'target'));
+            expect(context.modelsDir).toBe(path.join(tempDir, 'models'));
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2038.1",
+  "version": "0.2039.1",
   "license": "MIT",
   "bin": {
     "lightdash": "dist/index.js"
@@ -32,8 +32,8 @@
     "parse-node-version": "^2.0.0",
     "unique-names-generator": "^4.7.1",
     "uuid": "^11.0.3",
-    "@lightdash/common": "0.2038.1",
-    "@lightdash/warehouses": "0.2038.1"
+    "@lightdash/warehouses": "0.2039.1",
+    "@lightdash/common": "0.2039.1"
   },
   "description": "Lightdash CLI tool",
   "devDependencies": {