@lightdash/cli 0.1434.1 → 0.1435.0

package/README.md

@@ -40,10 +40,10 @@ Lightdash login
 node ./packages/cli/dist/index.js login http://localhost:3000
 ```
 
-Dbt compile
+Lightdash compile
 
 ```
-dbt compile --project-dir ./examples/full-jaffle-shop-demo/dbt --profiles-dir ./examples/full-jaffle-shop-demo/profiles
+node ./packages/cli/dist/index.js compile --project-dir ./examples/full-jaffle-shop-demo/dbt --profiles-dir ./examples/full-jaffle-shop-demo/profiles
 ```
 
 Lightdash generate

package/dist/dbt/manifest.d.ts

@@ -1,7 +1,6 @@
-import { DbtManifest, DbtManifestVersion } from '@lightdash/common';
+import { DbtManifest } from '@lightdash/common';
 export type LoadManifestArgs = {
     targetDir: string;
 };
-export declare const getDbtManifest: () => Promise<DbtManifestVersion>;
 export declare const getManifestPath: (targetDir: string) => Promise<string>;
 export declare const loadManifest: ({ targetDir, }: LoadManifestArgs) => Promise<DbtManifest>;

package/dist/dbt/manifest.js

@@ -1,29 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadManifest = exports.getManifestPath = exports.getDbtManifest = void 0;
+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"));
-const getDbtVersion_1 = require("../handlers/dbt/getDbtVersion");
-const getDbtManifest = async () => {
-    const version = await (0, getDbtVersion_1.getDbtVersion)();
-    if (version.startsWith('1.3.'))
-        return common_1.DbtManifestVersion.V7;
-    if (version.startsWith('1.5.'))
-        return common_1.DbtManifestVersion.V9;
-    if (version.startsWith('1.6.'))
-        return common_1.DbtManifestVersion.V10;
-    if (version.startsWith('1.7.'))
-        return common_1.DbtManifestVersion.V11;
-    if (version.startsWith('1.8.'))
-        return common_1.DbtManifestVersion.V12;
-    if (version.startsWith('1.9.'))
-        return common_1.DbtManifestVersion.V12;
-    return common_1.DbtManifestVersion.V8;
-};
-exports.getDbtManifest = getDbtManifest;
 const getManifestPath = async (targetDir) => path.join(targetDir, 'manifest.json');
 exports.getManifestPath = getManifestPath;
 const loadManifest = async ({ targetDir, }) => {

package/dist/dbt/validation.d.ts

@@ -1,8 +1,8 @@
-import { DbtModelNode, DbtRawModelNode, ExploreError } from '@lightdash/common';
+import { DbtModelNode, DbtRawModelNode, ExploreError, type DbtManifestVersion } from '@lightdash/common';
 type DbtModelsGroupedByState = {
     valid: DbtModelNode[];
     invalid: ExploreError[];
     skipped: DbtRawModelNode[];
 };
-export declare const validateDbtModel: (adapterType: string, models: DbtRawModelNode[]) => Promise<DbtModelsGroupedByState>;
+export declare const validateDbtModel: (adapterType: string, manifestVersion: DbtManifestVersion, models: DbtRawModelNode[]) => Promise<DbtModelsGroupedByState>;
 export {};

package/dist/dbt/validation.js

@@ -4,10 +4,8 @@ exports.validateDbtModel = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
-const manifest_1 = require("./manifest");
-const validateDbtModel = async (adapterType, models) => {
+const validateDbtModel = async (adapterType, manifestVersion, models) => {
     globalState_1.default.debug(`> Validating ${models.length} models from dbt manifest`);
-    const manifestVersion = await (0, manifest_1.getDbtManifest)();
     globalState_1.default.debug(`> Validating models using dbt manifest version ${manifestVersion}`);
     const validator = new common_1.ManifestValidator(manifestVersion);
     const results = models.reduce((acc, model) => {

package/dist/handlers/compile.js

@@ -19,7 +19,6 @@ const compile_1 = require("./dbt/compile");
 const getDbtVersion_1 = require("./dbt/getDbtVersion");
 const compile = async (options) => {
     const dbtVersion = await (0, getDbtVersion_1.getDbtVersion)();
-    const manifestVersion = await (0, manifest_1.getDbtManifest)();
     globalState_1.default.debug(`> dbt version ${dbtVersion}`);
     const executionId = (0, uuid_1.v4)();
     await analytics_1.LightdashAnalytics.track({
@@ -71,10 +70,11 @@ const compile = async (options) => {
             : undefined,
     });
     const manifest = await (0, manifest_1.loadManifest)({ targetDir: context.targetDir });
+    const manifestVersion = (0, common_1.getDbtManifestVersion)(manifest);
     const manifestModels = (0, models_1.getModelsFromManifest)(manifest);
     const compiledModels = (0, compile_1.getCompiledModels)(manifestModels, compiledModelIds);
     const adapterType = manifest.metadata.adapter_type;
-    const { valid: validModels, invalid: failedExplores } = await (0, validation_1.validateDbtModel)(adapterType, compiledModels);
+    const { valid: validModels, invalid: failedExplores } = await (0, validation_1.validateDbtModel)(adapterType, manifestVersion, compiledModels);
     if (failedExplores.length > 0) {
         const errors = failedExplores.map((failedExplore) => failedExplore.errors.map((error) => `- ${failedExplore.name}: ${error.message}\n`));
         console.error(styles.warning(`Found ${failedExplores.length} errors when validating dbt models:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lightdash/cli",
-    "version": "0.1434.1",
+    "version": "0.1435.0",
     "license": "MIT",
     "bin": {
         "lightdash": "dist/index.js"
@@ -11,8 +11,8 @@
     ],
     "dependencies": {
         "@actions/core": "^1.11.1",
-        "@lightdash/common": "^0.1434.1",
-        "@lightdash/warehouses": "^0.1434.1",
+        "@lightdash/common": "^0.1435.0",
+        "@lightdash/warehouses": "^0.1435.0",
         "@types/columnify": "^1.5.1",
         "ajv": "^8.11.0",
         "ajv-formats": "^2.1.1",