@lightdash/cli 0.2115.0 → 0.2116.0

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/dbt/context.ts"],"names":[],"mappings":"AAOA,KAAK,iBAAiB,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,aAAa,uCAGvB,iBAAiB,KAAG,OAAO,CAAC,UAAU,CAqDxC,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/dbt/context.ts"],"names":[],"mappings":"AAOA,KAAK,iBAAiB,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAkBF,eAAO,MAAM,aAAa,uCAGvB,iBAAiB,KAAG,OAAO,CAAC,UAAU,CA+CxC,CAAC"}

package/dist/dbt/context.js

@@ -8,6 +8,16 @@ 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");
+function tryRenderVariable(variableName, raw) {
+    try {
+        return (0, templating_1.renderTemplatedYml)(raw);
+    }
+    catch (e) {
+        globalState_1.default.debug(`> Warning: Failed to render Jinja in dbt_project.yml ${variableName}: ${(0, common_1.getErrorMessage)(e)}`);
+        globalState_1.default.debug('> Falling back to parsing raw YAML without Jinja rendering');
+        return raw;
+    }
+}
 const getDbtContext = async ({ projectDir, initialProjectDir, }) => {
     globalState_1.default.debug(`> Loading dbt_project.yml file from: ${projectDir}`);
     const projectFilename = path.join(projectDir, 'dbt_project.yml');
@@ -26,26 +36,23 @@ 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}`);
     }
-    // Try to render Jinja templating (e.g., env_var) before parsing YAML
-    // If rendering fails, fall back to parsing the raw file for back compat
-    let renderedFile;
-    try {
-        renderedFile = (0, templating_1.renderTemplatedYml)(file);
-    }
-    catch (e) {
-        globalState_1.default.debug(`> Warning: Failed to render Jinja in dbt_project.yml: ${(0, common_1.getErrorMessage)(e)}`);
-        globalState_1.default.debug('> Falling back to parsing raw YAML without Jinja rendering');
-        renderedFile = file;
-    }
-    const config = yaml.load(renderedFile);
-    const targetSubDir = config['target-path'] || './target';
+    const config = yaml.load(file);
+    // Try to render Jinja templating (e.g., env_var) for each individual config key needed
+    let targetSubDir = config['target-path'] || './target';
+    let modelsSubDir = config['models-path'] || './models';
+    let projectName = config.name;
+    let profileName = config.profile;
+    // ! Important: We only render the variables that are needed for the context, other variables are not rendered to avoid unexpected behavior.
+    targetSubDir = tryRenderVariable('target-path', targetSubDir);
+    modelsSubDir = tryRenderVariable('models-path', modelsSubDir);
+    projectName = tryRenderVariable('name', projectName);
+    profileName = tryRenderVariable('profile', profileName);
     globalState_1.default.debug(`> dbt target directory: ${targetSubDir}`);
     const targetDir = path.join(projectDir, targetSubDir);
-    const modelsSubDir = config['models-path'] || './models';
     const modelsDir = path.join(projectDir, modelsSubDir);
     return {
-        projectName: config.name,
-        profileName: config.profile,
+        projectName,
+        profileName,
         targetDir,
         modelsDir,
     };

package/package.json

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