@lightdash/cli 0.2031.1 → 0.2032.0

package/dist/dbt/models.d.ts

@@ -1,4 +1,4 @@
-import { DbtDoc, DbtModelNode, DbtSchemaEditor } from '@lightdash/common';
+import { DbtDoc, DbtModelNode, DbtSchemaEditor, SupportedDbtVersions } from '@lightdash/common';
 import { WarehouseClient, WarehouseTableSchema } from '@lightdash/warehouses';
 type CompiledModel = {
     name: string;
@@ -24,8 +24,9 @@ type FindAndUpdateModelYamlArgs = {
     projectDir: string;
     projectName: string;
     assumeYes: boolean;
+    dbtVersion?: SupportedDbtVersions;
 };
-export declare const findAndUpdateModelYaml: ({ model, table, docs, includeMeta, projectDir, projectName, assumeYes, }: FindAndUpdateModelYamlArgs) => Promise<{
+export declare const findAndUpdateModelYaml: ({ model, table, docs, includeMeta, projectDir, projectName, assumeYes, dbtVersion, }: FindAndUpdateModelYamlArgs) => Promise<{
     updatedYml: DbtSchemaEditor;
     outputFilePath: string;
 }>;

package/dist/dbt/models.js

@@ -32,19 +32,26 @@ const getWarehouseTableForModel = async ({ model, warehouseClient, preserveColum
     }, {});
 };
 exports.getWarehouseTableForModel = getWarehouseTableForModel;
-const generateModelYml = ({ model, table, includeMeta, }) => ({
+// Check if we should use dbt 1.10+ metadata structure
+const wrapInConfig = (dbtVersion, meta) => {
+    const useDbt110Metadata = dbtVersion &&
+        Object.values(common_1.SupportedDbtVersions).indexOf(dbtVersion) >=
+            Object.values(common_1.SupportedDbtVersions).indexOf(common_1.SupportedDbtVersions.V1_10);
+    return useDbt110Metadata ? { config: { meta } } : { meta };
+};
+const generateModelYml = ({ model, table, includeMeta, dbtVersion, }) => ({
     name: model.name,
     columns: Object.entries(table).map(([columnName, dimensionType]) => ({
         name: columnName,
         description: '',
         ...(includeMeta
-            ? {
+            ? wrapInConfig(dbtVersion, {
                 meta: {
                     dimension: {
                         type: dimensionType,
                     },
                 },
-            }
+            })
             : {}),
     })),
 });
@@ -83,11 +90,12 @@ const askOverwriteDescription = async (columnName, existingDescription, newDescr
         return newDescription;
     return existingDescription;
 };
-const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, projectDir, projectName, assumeYes, }) => {
+const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, projectDir, projectName, assumeYes, dbtVersion, }) => {
     const generatedModel = generateModelYml({
         model,
         table,
         includeMeta,
+        dbtVersion,
     });
     const filenames = [];
     const { patchPath, packageName } = model;
@@ -107,6 +115,7 @@ const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, project
     const match = await (0, schema_1.searchForModel)({
         modelName: model.name,
         filenames,
+        dbtVersion,
     });
     if (match) {
         const { schemaEditor } = match;
@@ -137,7 +146,7 @@ const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, project
                 columnName: column.name,
                 properties: {
                     description,
-                    meta,
+                    ...(meta ? wrapInConfig(dbtVersion, meta) : {}),
                 },
             });
         }
@@ -176,7 +185,7 @@ const findAndUpdateModelYaml = async ({ model, table, docs, includeMeta, project
         };
     }
     return {
-        updatedYml: new common_1.DbtSchemaEditor().addModel(generatedModel),
+        updatedYml: new common_1.DbtSchemaEditor('', '', dbtVersion).addModel(generatedModel),
         outputFilePath,
     };
 };

package/dist/dbt/schema.d.ts

@@ -1,4 +1,4 @@
-import { DbtSchemaEditor, DimensionType } from '@lightdash/common';
+import { DbtSchemaEditor, DimensionType, SupportedDbtVersions } from '@lightdash/common';
 type YamlColumnMeta = {
     dimension?: {
         type?: DimensionType;
@@ -21,8 +21,9 @@ export type YamlSchema = {
 type SearchForModelArgs = {
     modelName: string;
     filenames: string[];
+    dbtVersion?: SupportedDbtVersions;
 };
-export declare const searchForModel: ({ modelName, filenames, }: SearchForModelArgs) => Promise<{
+export declare const searchForModel: ({ modelName, filenames, dbtVersion, }: SearchForModelArgs) => Promise<{
     schemaEditor: DbtSchemaEditor;
     filename: string;
 } | undefined>;

package/dist/dbt/schema.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchForModel = void 0;
 const common_1 = require("@lightdash/common");
 const fs_1 = require("fs");
-const loadYamlSchema = async (path) => {
+const loadYamlSchema = async (path, dbtVersion) => {
     try {
-        return new common_1.DbtSchemaEditor(await fs_1.promises.readFile(path, 'utf8'));
+        return new common_1.DbtSchemaEditor(await fs_1.promises.readFile(path, 'utf8'), path, dbtVersion);
     }
     catch (e) {
         if (e instanceof common_1.ParseError) {
@@ -15,9 +15,9 @@ const loadYamlSchema = async (path) => {
         throw e;
     }
 };
-const findModelInYaml = async ({ filename, modelName, }) => {
+const findModelInYaml = async ({ filename, modelName, dbtVersion, }) => {
     try {
-        const schemaEditor = await loadYamlSchema(filename);
+        const schemaEditor = await loadYamlSchema(filename, dbtVersion);
         if (schemaEditor.findModelByName(modelName)) {
             return schemaEditor;
         }
@@ -30,9 +30,13 @@ const findModelInYaml = async ({ filename, modelName, }) => {
         throw e;
     }
 };
-const searchForModel = async ({ modelName, filenames, }) => {
+const searchForModel = async ({ modelName, filenames, dbtVersion, }) => {
     for await (const filename of filenames) {
-        const schemaEditor = await findModelInYaml({ filename, modelName });
+        const schemaEditor = await findModelInYaml({
+            filename,
+            modelName,
+            dbtVersion,
+        });
         if (schemaEditor) {
             return {
                 schemaEditor,

package/dist/handlers/generate.js

@@ -79,6 +79,11 @@ const generateHandler = async (options) => {
                 warehouseClient,
                 preserveColumnCase: options.preserveColumnCase,
             });
+            // Resolve dbt version for metadata structure
+            const resolvedDbtVersion = dbtVersion.versionOption === common_1.DbtVersionOptionLatest.LATEST
+                ? (0, common_1.getLatestSupportDbtVersion)()
+                : dbtVersion.versionOption;
+            globalState_1.default.debug(`Using detected dbt version ${resolvedDbtVersion} for metadata structure`);
             const { updatedYml, outputFilePath } = await (0, models_1.findAndUpdateModelYaml)({
                 model: compiledModel,
                 table,
@@ -87,6 +92,7 @@ const generateHandler = async (options) => {
                 projectDir: absoluteProjectPath,
                 projectName: context.projectName,
                 assumeYes: options.assumeYes,
+                dbtVersion: resolvedDbtVersion,
             });
             try {
                 if (options.skipExisting) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2031.1",
+  "version": "0.2032.0",
   "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.2031.1",
-    "@lightdash/warehouses": "0.2031.1"
+    "@lightdash/common": "0.2032.0",
+    "@lightdash/warehouses": "0.2032.0"
   },
   "description": "Lightdash CLI tool",
   "devDependencies": {