@lightdash/cli 0.1462.2 → 0.1464.0

package/dist/dbt/context.js

@@ -22,7 +22,7 @@ const getDbtContext = async ({ projectDir, initialProjectDir, }) => {
                 initialProjectDir: initialProjectDir || projectDir,
             });
         }
-        const msg = e instanceof Error ? e.message : '-';
+        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);

package/dist/dbt/manifest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadManifest = exports.getManifestPath = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@lightdash/common");
 const fs_1 = require("fs");
 const path = tslib_1.__importStar(require("path"));
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
@@ -15,7 +16,7 @@ const loadManifest = async ({ targetDir, }) => {
         return manifest;
     }
     catch (err) {
-        const msg = err instanceof Error ? err.message : '-';
+        const msg = (0, common_1.getErrorMessage)(err);
         throw new Error(`Could not load manifest from ${filename}:\n  ${msg}`);
     }
 };

package/dist/dbt/profile.js

@@ -23,7 +23,7 @@ const loadDbtTarget = async ({ profilesDir, profileName, targetName, }) => {
         allProfiles = yaml.load(rendered);
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
+        const msg = (0, common_1.getErrorMessage)(e);
         throw new common_1.ParseError(`Could not find a valid profiles.yml file at ${profilePath}:\n  ${msg}`);
     }
     const profile = allProfiles[profileName];

package/dist/dbt/targets/Bigquery/serviceAccount.js

@@ -65,7 +65,7 @@ const getBigqueryCredentialsFromServiceAccount = async (target) => {
             return JSON.parse(await fs_1.promises.readFile(keyfilePath, 'utf8'));
         }
         catch (e) {
-            const msg = e instanceof Error ? e.message : '-';
+            const msg = (0, common_1.getErrorMessage)(e);
             throw new common_1.ParseError(`Cannot read keyfile for bigquery target expect at: ${keyfilePath}:\n  ${msg}`);
         }
     }

package/dist/dbt/targets/snowflake.js

@@ -85,7 +85,7 @@ const convertSnowflakeSchema = async (target) => {
                 privateKey = await fs_1.promises.readFile(keyfilePath, 'utf8');
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : '-';
+                const msg = (0, common_1.getErrorMessage)(e);
                 throw new common_1.ParseError(`Cannot read keyfile for snowflake target at: ${keyfilePath}:\n  ${msg}`);
             }
         }

package/dist/handlers/compile.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileHandler = exports.compile = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
+const fs_1 = require("fs");
 const path_1 = tslib_1.__importDefault(require("path"));
 const uuid_1 = require("uuid");
 const analytics_1 = require("../analytics/analytics");
@@ -14,6 +15,24 @@ const styles = tslib_1.__importStar(require("../styles"));
 const compile_1 = require("./dbt/compile");
 const getDbtVersion_1 = require("./dbt/getDbtVersion");
 const getWarehouseClient_1 = tslib_1.__importDefault(require("./dbt/getWarehouseClient"));
+const readAndLoadLightdashProjectConfig = async (projectDir) => {
+    const configPath = path_1.default.join(projectDir, 'lightdash.config.yml');
+    try {
+        const fileContents = await fs_1.promises.readFile(configPath, 'utf8');
+        const config = await (0, common_1.loadLightdashProjectConfig)(fileContents);
+        return config;
+    }
+    catch (e) {
+        globalState_1.default.debug(`No lightdash.config.yml found in ${configPath}`);
+        if (e instanceof Error && 'code' in e && e.code === 'ENOENT') {
+            // Return default config if file doesn't exist
+            return {
+                spotlight: common_1.DEFAULT_SPOTLIGHT_CONFIG,
+            };
+        }
+        throw e;
+    }
+};
 const compile = async (options) => {
     const dbtVersion = await (0, getDbtVersion_1.getDbtVersion)();
     globalState_1.default.debug(`> dbt version ${dbtVersion}`);
@@ -72,13 +91,16 @@ ${errors.join('')}`));
         throw new common_1.ParseError(`Dbt adapter ${manifest.metadata.adapter_type} is not supported`);
     }
     globalState_1.default.debug(`> Converting explores with adapter: ${manifest.metadata.adapter_type}`);
+    globalState_1.default.debug(`> Loading lightdash project config from ${absoluteProjectPath}`);
+    const lightdashProjectConfig = await readAndLoadLightdashProjectConfig(absoluteProjectPath);
+    globalState_1.default.debug(`> Loaded lightdash project config`);
     const validExplores = await (0, common_1.convertExplores)(validModelsWithTypes, false, manifest.metadata.adapter_type, [
         common_1.DbtManifestVersion.V10,
         common_1.DbtManifestVersion.V11,
         common_1.DbtManifestVersion.V12,
     ].includes(manifestVersion)
         ? []
-        : Object.values(manifest.metrics), warehouseClient);
+        : Object.values(manifest.metrics), warehouseClient, lightdashProjectConfig);
     console.error('');
     const explores = [...validExplores, ...failedExplores];
     explores.forEach((e) => {

package/dist/handlers/dbt/apiClient.js

@@ -49,6 +49,7 @@ const lightdashApi = async ({ method, url, body, }) => {
         }
     })
         .catch((err) => {
+        // ApiErrorResponse
         throw err;
     });
 };

package/dist/handlers/dbt/compile.js

@@ -47,7 +47,7 @@ const dbtCompile = async (options) => {
         console.error(stderr);
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
+        const msg = (0, common_1.getErrorMessage)(e);
         throw new common_1.ParseError(`Failed to run dbt compile:\n  ${msg}`);
     }
 };
@@ -105,7 +105,7 @@ async function dbtList(options) {
         return models;
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
+        const msg = (0, common_1.getErrorMessage)(e);
         throw new common_1.ParseError(`Error executing 'dbt ls':\n  ${msg}\nEnsure you're on the latest patch version. '--use-dbt-list' is true by default; if you encounter issues, try using '--use-dbt-list=false`);
     }
 }

package/dist/handlers/dbt/getDbtProfileTargetName.js

@@ -21,8 +21,7 @@ const getDbtCloudTargetName = async () => {
         return targetName[1];
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
-        throw new common_1.ParseError(`Failed to get profile target name:\n  ${msg}`);
+        throw new common_1.ParseError(`Failed to get profile target name:\n  ${(0, common_1.getErrorMessage)(e)}`);
     }
 };
 async function getDbtProfileTargetName(options) {

package/dist/handlers/dbt/getDbtVersion.js

@@ -26,7 +26,7 @@ const getDbtCLIVersion = async () => {
         return version[0].split(':')[1].trim();
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
+        const msg = (0, common_1.getErrorMessage)(e);
         throw new common_1.ParseError(`Failed to get dbt --version:\n  ${msg}`);
     }
 };

package/dist/handlers/dbt/getWarehouseClient.js

@@ -34,8 +34,7 @@ const getDbtCloudConnectionType = async () => {
         return connectionType[1];
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
-        throw new common_1.ParseError(`Failed to get connection type:\n  ${msg}`);
+        throw new common_1.ParseError(`Failed to get connection type:\n  ${(0, common_1.getErrorMessage)(e)}`);
     }
 };
 function getMockCredentials(dbtAdaptorType) {

package/dist/handlers/dbt/run.js

@@ -31,7 +31,7 @@ const dbtRunHandler = async (options, command) => {
         await subprocess;
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
+        const msg = (0, common_1.getErrorMessage)(e);
         await analytics_1.LightdashAnalytics.track({
             event: 'dbt_command.error',
             properties: {

package/dist/handlers/download.js

@@ -301,7 +301,7 @@ const upsertResources = async (type, projectId, changes, force, slugs, customPat
         catch (error) {
             changes[`${type} with errors`] =
                 (changes[`${type} with errors`] ?? 0) + 1;
-            console.error(styles.error(`Error upserting ${type}: ${error}`));
+            console.error(styles.error(`Error upserting ${type}: ${(0, common_1.getErrorMessage)(error)}`));
             await analytics_1.LightdashAnalytics.track({
                 event: 'download.error',
                 properties: {
@@ -309,7 +309,7 @@ const upsertResources = async (type, projectId, changes, force, slugs, customPat
                     organizationId: config.user?.organizationUuid,
                     projectId,
                     type,
-                    error: `${error}`,
+                    error: (0, common_1.getErrorMessage)(error),
                 },
             });
         }
@@ -375,14 +375,14 @@ const uploadHandler = async (options) => {
         logUploadChanges(changes);
     }
     catch (error) {
-        console.error(styles.error(`\nError downloading ${error}`));
+        console.error(styles.error(`\nError downloading: ${(0, common_1.getErrorMessage)(error)}`));
         await analytics_1.LightdashAnalytics.track({
             event: 'download.error',
             properties: {
                 userId: config.user?.userUuid,
                 organizationId: config.user?.organizationUuid,
                 projectId,
-                error: `${error}`,
+                error: (0, common_1.getErrorMessage)(error),
             },
         });
     }

package/dist/handlers/generate.js

@@ -118,13 +118,13 @@ const generateHandler = async (options) => {
                     : ymlString);
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : '-';
+                const msg = (0, common_1.getErrorMessage)(e);
                 throw new common_1.ParseError(`Failed to write file ${outputFilePath}\n ${msg}`);
             }
             spinner.succeed(`  ${styles.bold(compiledModel.name)}${styles.info(` ➡️  ${path.relative(process.cwd(), outputFilePath)}`)}`);
         }
         catch (e) {
-            const msg = e instanceof Error ? e.message : '-';
+            const msg = (0, common_1.getErrorMessage)(e);
             await analytics_1.LightdashAnalytics.track({
                 event: 'generate.error',
                 properties: {

package/dist/handlers/generateExposures.js

@@ -59,13 +59,12 @@ const generateExposuresHandler = async (options) => {
         });
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : '-';
         await analytics_1.LightdashAnalytics.track({
             event: 'generate_exposures.error',
             properties: {
                 executionId,
                 trigger: 'generate',
-                error: `${msg}`,
+                error: `${(0, common_1.getErrorMessage)(e)}`,
             },
         });
         spinner.fail(`  Failed to generate exposures file'`);

package/dist/index.js

@@ -318,7 +318,7 @@ ${styles.bold('Examples:')}
     .option('--output <path>', 'The path where the output exposures YAML file will be written', undefined)
     .action(generateExposures_1.generateExposuresHandler);
 const errorHandler = (err) => {
-    console.error(styles.error(err.message || 'Error had no message'));
+    console.error(styles.error((0, common_1.getErrorMessage)(err)));
     if (err.name === 'AuthorizationError') {
         console.error(`Looks like you did not authenticate or the personal access token expired.\n\n👀 See https://docs.lightdash.com/guides/cli/cli-authentication for help and examples`);
     }

package/package.json

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