@lightdash/cli 2.319.3 → 2.319.4

package/dist/handlers/dbt/getDbtVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDbtVersion.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/getDbtVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAMnB,MAAM,mBAAmB,CAAC;AAqE3B,MAAM,MAAM,UAAU,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,gBAAgB,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,UAAU,CA+CxD,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAC7C;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAc9E,CAAC"}
+{"version":3,"file":"getDbtVersion.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/getDbtVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAMnB,MAAM,mBAAmB,CAAC;AA2E3B,MAAM,MAAM,UAAU,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,gBAAgB,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,UAAU,CA+CxD,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAC7C;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAc9E,CAAC"}

package/dist/handlers/dbt/getDbtVersion.js

@@ -10,6 +10,7 @@ const styles = tslib_1.__importStar(require("../../styles"));
 const DBT_CORE_VERSION_REGEX = /installed:.*/;
 const DBT_CLOUD_CLI_REGEX = /dbt Cloud CLI.*/;
 const DBT_FUSION_VERSION_REGEX = /dbt-fusion.*/;
+const DBT_V2_VERSION_REGEX = /^dbt 2\.\d+\.\d+\S*/m;
 const getDbtCLIVersion = async () => {
     try {
         const { all } = await (0, execa_1.default)('dbt', ['--version'], {
@@ -25,6 +26,10 @@ const getDbtCLIVersion = async () => {
         if (fusionVersion) {
             return fusionVersion[0]; // eg: dbt-fusion 2.0.0-preview.65
         }
+        const v2Version = logs.match(DBT_V2_VERSION_REGEX);
+        if (v2Version) {
+            return v2Version[0]; // eg: dbt 2.0.6
+        }
         const version = logs.match(DBT_CORE_VERSION_REGEX);
         if (version === null || version.length === 0)
             throw new common_1.ParseError(`Can't locate dbt --version: ${logs}`);
@@ -36,11 +41,12 @@ const getDbtCLIVersion = async () => {
     }
 };
 const isDbtCloudCLI = (version) => version.match(DBT_CLOUD_CLI_REGEX) !== null;
-const isDbtFusion = (version) => version.match(DBT_FUSION_VERSION_REGEX) !== null;
+const isDbtFusion = (version) => version.match(DBT_FUSION_VERSION_REGEX) !== null ||
+    version.match(DBT_V2_VERSION_REGEX) !== null;
 const getSupportedDbtVersionOption = (version) => {
     if (version.match(DBT_CLOUD_CLI_REGEX))
         return common_1.DbtVersionOptionLatest.LATEST;
-    if (version.match(DBT_FUSION_VERSION_REGEX))
+    if (isDbtFusion(version))
         return common_1.DbtVersionOptionLatest.LATEST;
     if (version.startsWith('1.4.'))
         return common_1.SupportedDbtVersions.V1_4;

package/dist/handlers/dbt/getDbtVersion.mocks.d.ts

@@ -6,6 +6,10 @@ export declare const cliMocks: {
     dbt1_11: Partial<ExecaReturnValue>;
     dbt1_12: Partial<ExecaReturnValue>;
     dbtCloud: Partial<ExecaReturnValue>;
+    dbtFusionPreview: Partial<ExecaReturnValue>;
+    dbt2_0_0: Partial<ExecaReturnValue>;
+    dbt2_0_6: Partial<ExecaReturnValue>;
+    dbt2Preview: Partial<ExecaReturnValue>;
     dbt20_1: Partial<ExecaReturnValue>;
     error: Partial<ExecaError>;
 };

package/dist/handlers/dbt/getDbtVersion.mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDbtVersion.mocks.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/getDbtVersion.mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAErD,eAAO,MAAM,QAAQ;IACjB,MAAM,EAKD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,MAAM,EAsBD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,MAAM,EAaD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAaF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAaF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,QAAQ,EAEH,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAKF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,KAAK,EAGA,OAAO,CAAC,UAAU,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"getDbtVersion.mocks.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/getDbtVersion.mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAErD,eAAO,MAAM,QAAQ;IACjB,MAAM,EAKD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,MAAM,EAsBD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,MAAM,EAaD,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAaF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAaF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,QAAQ,EAEH,OAAO,CAAC,gBAAgB,CAAC;IAC9B,gBAAgB,EAEX,OAAO,CAAC,gBAAgB,CAAC;IAC9B,QAAQ,EAEH,OAAO,CAAC,gBAAgB,CAAC;IAC9B,QAAQ,EAEH,OAAO,CAAC,gBAAgB,CAAC;IAC9B,WAAW,EAEN,OAAO,CAAC,gBAAgB,CAAC;IAC9B,OAAO,EAKF,OAAO,CAAC,gBAAgB,CAAC;IAC9B,KAAK,EAGA,OAAO,CAAC,UAAU,CAAC;CAC3B,CAAC"}

package/dist/handlers/dbt/getDbtVersion.mocks.js

@@ -71,6 +71,18 @@ exports.cliMocks = {
     dbtCloud: {
         all: 'dbt Cloud CLI - 0.38.22 (1183c2abdb6003083b0fa91fcd89cd5feb25f9f7 2024-11-20T15:49:01Z)',
     },
+    dbtFusionPreview: {
+        all: 'dbt-fusion 2.0.0-preview.65',
+    },
+    dbt2_0_0: {
+        all: 'dbt 2.0.0',
+    },
+    dbt2_0_6: {
+        all: 'dbt 2.0.6\n',
+    },
+    dbt2Preview: {
+        all: 'dbt 2.0.0-preview.178',
+    },
     dbt20_1: {
         all: 'Core:\n' +
             '  - installed: 20.1.0\n' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "2.319.3",
+  "version": "2.319.4",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -22,8 +22,8 @@
     "@actions/core": "1.11.1",
     "@aws-sdk/credential-providers": "3.995.0",
     "@casl/ability": "6.8.0",
-    "@lightdash/common": "2.319.3",
-    "@lightdash/warehouses": "2.319.3",
+    "@lightdash/common": "2.319.4",
+    "@lightdash/warehouses": "2.319.4",
     "@sidvind/better-ajv-errors": "7.0.0",
     "@types/columnify": "1.5.1",
     "ajv": "8.18.0",