@lightdash/cli 0.2203.0 → 0.2205.0

package/dist/handlers/compile.d.ts

@@ -1,3 +1,4 @@
+import { Explore, ExploreError } from '@lightdash/common';
 import { DbtCompileOptions } from './dbt/compile';
 export type CompileHandlerOptions = DbtCompileOptions & {
     projectDir: string;
@@ -9,6 +10,6 @@ export type CompileHandlerOptions = DbtCompileOptions & {
     startOfWeek?: number;
     warehouseCredentials?: boolean;
 };
-export declare const compile: (options: CompileHandlerOptions) => Promise<(import("@lightdash/common").Explore | import("@lightdash/common").ExploreError)[]>;
+export declare const compile: (options: CompileHandlerOptions) => Promise<(Explore | ExploreError)[]>;
 export declare const compileHandler: (originalOptions: CompileHandlerOptions) => Promise<void>;
 //# sourceMappingURL=compile.d.ts.map

package/dist/handlers/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAI9E,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,GAAG;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,OAAO,YAAmB,qBAAqB,gGA2J3D,CAAC;AACF,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAuBzC,CAAC"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,OAAO,EACP,YAAY,EAUf,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAI9E,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,GAAG;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAyDF,eAAO,MAAM,OAAO,YAAmB,qBAAqB,wCAmL3D,CAAC;AACF,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAuBzC,CAAC"}

package/dist/handlers/compile.js

@@ -12,10 +12,36 @@ const manifest_1 = require("../dbt/manifest");
 const validation_1 = require("../dbt/validation");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
 const lightdash_config_1 = require("../lightdash-config");
+const loader_1 = require("../lightdash/loader");
 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 getExploresFromLightdashYmlProject = async (projectDir, lightdashProjectConfig, startOfWeek) => {
+    // Try to load Lightdash YAML models
+    const lightdashModels = await (0, loader_1.loadLightdashModels)(projectDir);
+    if (lightdashModels.length === 0) {
+        return null; // No Lightdash models, use dbt path
+    }
+    globalState_1.default.debug(`> Found ${lightdashModels.length} Lightdash YAML models`);
+    if (!lightdashProjectConfig.warehouse?.type) {
+        throw new common_1.ParseError('Lightdash models found but no warehouse type specified in lightdash.config.yml.\n' +
+            'Add a warehouse section:\n' +
+            'warehouse:\n' +
+            '  type: postgres  # or bigquery, snowflake, redshift, databricks, trino, clickhouse');
+    }
+    const adapterType = lightdashProjectConfig.warehouse.type;
+    globalState_1.default.debug(`> Using adapter type from lightdash.config.yml: ${adapterType}`);
+    // Convert Lightdash models to DbtModelNode format
+    const validModels = (0, common_1.convertLightdashModelsToDbtModels)(lightdashModels);
+    if (validModels.length === 0) {
+        return null;
+    }
+    globalState_1.default.debug('> Skipping warehouse catalog (types in YAML)');
+    const warehouseSqlBuilder = (0, warehouses_1.warehouseSqlBuilderFromType)(adapterType, startOfWeek);
+    const validExplores = await (0, common_1.convertExplores)(validModels, false, warehouseSqlBuilder.getAdapterType(), [], warehouseSqlBuilder, lightdashProjectConfig);
+    return validExplores;
+};
 const compile = async (options) => {
     const dbtVersion = await (0, getDbtVersion_1.getDbtVersion)();
     globalState_1.default.debug(`> dbt version ${dbtVersion.verboseVersion}`);
@@ -32,64 +58,74 @@ const compile = async (options) => {
     });
     const absoluteProjectPath = path_1.default.resolve(options.projectDir);
     globalState_1.default.debug(`> Compiling with project dir ${absoluteProjectPath}`);
-    const context = await (0, context_1.getDbtContext)({
-        projectDir: absoluteProjectPath,
-        targetPath: options.targetPath,
-    });
-    const compiledModelIds = await (0, compile_1.maybeCompileModelsAndJoins)({ targetDir: context.targetDir }, options);
-    const manifest = await (0, manifest_1.loadManifest)({ targetDir: context.targetDir });
-    const manifestVersion = (0, common_1.getDbtManifestVersion)(manifest);
-    const manifestModels = (0, common_1.getModelsFromManifest)(manifest);
-    const compiledModels = (0, common_1.getCompiledModels)(manifestModels, compiledModelIds);
-    const adapterType = manifest.metadata.adapter_type;
-    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:
-${errors.join('')}`));
-    }
-    // Skipping assumes yml has the field types.
-    let catalog = {};
-    if (!options.skipWarehouseCatalog) {
-        const { warehouseClient } = await (0, getWarehouseClient_1.default)({
-            isDbtCloudCLI: dbtVersion.isDbtCloudCLI,
-            profilesDir: options.profilesDir,
-            profile: options.profile || context.profileName,
-            target: options.target,
-            startOfWeek: options.startOfWeek,
-        });
-        globalState_1.default.debug('> Fetching warehouse catalog');
-        catalog = await warehouseClient.getCatalog((0, common_1.getSchemaStructureFromDbtModels)(validModels));
-    }
-    else {
-        globalState_1.default.debug('> Skipping warehouse catalog');
-    }
-    const validModelsWithTypes = (0, common_1.attachTypesToModels)(validModels, catalog, false);
-    if (!(0, common_1.isSupportedDbtAdapter)(manifest.metadata)) {
-        await analytics_1.LightdashAnalytics.track({
-            event: 'compile.error',
-            properties: {
-                executionId,
-                dbtVersion: dbtVersion.verboseVersion,
-                error: `Dbt adapter ${manifest.metadata.adapter_type} is not supported`,
-            },
-        });
-        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}`);
+    // Load Lightdash Project
+    // Load Lightdash project config
     const lightdashProjectConfig = await (0, lightdash_config_1.readAndLoadLightdashProjectConfig)(absoluteProjectPath);
     globalState_1.default.debug(`> Loaded lightdash project config`);
-    const warehouseSqlBuilder = (0, warehouses_1.warehouseSqlBuilderFromType)(adapterType, options.startOfWeek);
-    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), warehouseSqlBuilder, lightdashProjectConfig);
-    console.error('');
-    const explores = [...validExplores, ...failedExplores];
+    // Try lightdash project compile
+    let explores = null;
+    let dbtMetrics = null;
+    explores = await getExploresFromLightdashYmlProject(absoluteProjectPath, lightdashProjectConfig, options.startOfWeek);
+    // Load dbt Project
+    if (explores === null) {
+        const context = await (0, context_1.getDbtContext)({
+            projectDir: absoluteProjectPath,
+            targetPath: options.targetPath,
+        });
+        const compiledModelIds = await (0, compile_1.maybeCompileModelsAndJoins)({ targetDir: context.targetDir }, options);
+        const manifest = await (0, manifest_1.loadManifest)({ targetDir: context.targetDir });
+        const manifestVersion = (0, common_1.getDbtManifestVersion)(manifest);
+        const manifestModels = (0, common_1.getModelsFromManifest)(manifest);
+        const compiledModels = (0, common_1.getCompiledModels)(manifestModels, compiledModelIds);
+        const adapterType = manifest.metadata.adapter_type;
+        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:
+    ${errors.join('')}`));
+        }
+        // Skipping assumes yml has the field types.
+        let catalog = {};
+        if (!options.skipWarehouseCatalog) {
+            const { warehouseClient } = await (0, getWarehouseClient_1.default)({
+                isDbtCloudCLI: dbtVersion.isDbtCloudCLI,
+                profilesDir: options.profilesDir,
+                profile: options.profile || context.profileName,
+                target: options.target,
+                startOfWeek: options.startOfWeek,
+            });
+            globalState_1.default.debug('> Fetching warehouse catalog');
+            catalog = await warehouseClient.getCatalog((0, common_1.getSchemaStructureFromDbtModels)(validModels));
+        }
+        else {
+            globalState_1.default.debug('> Skipping warehouse catalog');
+        }
+        const validModelsWithTypes = (0, common_1.attachTypesToModels)(validModels, catalog, false);
+        if (!(0, common_1.isSupportedDbtAdapter)(manifest.metadata)) {
+            await analytics_1.LightdashAnalytics.track({
+                event: 'compile.error',
+                properties: {
+                    executionId,
+                    dbtVersion: dbtVersion.verboseVersion,
+                    error: `Dbt adapter ${manifest.metadata.adapter_type} is not supported`,
+                },
+            });
+            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 warehouseSqlBuilder = (0, warehouses_1.warehouseSqlBuilderFromType)(adapterType, options.startOfWeek);
+        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), warehouseSqlBuilder, lightdashProjectConfig);
+        console.error('');
+        explores = [...validExplores, ...failedExplores];
+        dbtMetrics = manifest.metrics;
+    }
     explores.forEach((e) => {
         const status = (0, common_1.isExploreError)(e)
             ? styles.error('ERROR')
@@ -102,13 +138,14 @@ ${errors.join('')}`));
     console.error('');
     const errors = explores.filter((e) => (0, common_1.isExploreError)(e)).length;
     console.error(`Compiled ${explores.length} explores, SUCCESS=${explores.length - errors} ERRORS=${errors}`);
+    const metricsCount = dbtMetrics === null ? 0 : Object.values(dbtMetrics.metrics).length;
     await analytics_1.LightdashAnalytics.track({
         event: 'compile.completed',
         properties: {
             executionId,
             explores: explores.length,
             errors,
-            dbtMetrics: Object.values(manifest.metrics).length,
+            dbtMetrics: metricsCount,
             dbtVersion: dbtVersion.verboseVersion,
         },
     });

package/dist/handlers/createProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createProject.d.ts","sourceRoot":"","sources":["../../src/handlers/createProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,+BAA+B,EAE/B,WAAW,EAEX,KAAK,uBAAuB,EAG/B,MAAM,mBAAmB,CAAC;AA2D3B,eAAO,MAAM,kCAAkC,SACrC,MAAM,KACb,OAAO,CAAC,MAAM,CAyChB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,+BAA+B,CAAC;IACrD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,aAAa,YACb,oBAAoB,KAC9B,OAAO,CAAC,uBAAuB,GAAG,SAAS,CA8H7C,CAAC"}
+{"version":3,"file":"createProject.d.ts","sourceRoot":"","sources":["../../src/handlers/createProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,+BAA+B,EAE/B,WAAW,EAEX,KAAK,uBAAuB,EAG/B,MAAM,mBAAmB,CAAC;AA2D3B,eAAO,MAAM,kCAAkC,SACrC,MAAM,KACb,OAAO,CAAC,MAAM,CAyChB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,+BAA+B,CAAC;IACrD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,aAAa,YACb,oBAAoB,KAC9B,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAkI7C,CAAC"}

package/dist/handlers/createProject.js

@@ -94,16 +94,16 @@ const createProject = async (options) => {
     }
     const dbtVersion = await (0, getDbtVersion_1.getDbtVersion)();
     const absoluteProjectPath = path_1.default.resolve(options.projectDir);
-    const context = await (0, context_1.getDbtContext)({
-        projectDir: absoluteProjectPath,
-        targetPath: options.targetPath,
-    });
     let targetName;
     let credentials;
     // If using organization credentials, don't load warehouse credentials from profiles
     if (organizationWarehouseCredentialsUuid) {
         globalState_1.default.debug(`> Using organization warehouse credentials: ${options.organizationCredentials}`);
         // Still need to get target name for dbt connection
+        const context = await (0, context_1.getDbtContext)({
+            projectDir: absoluteProjectPath,
+            targetPath: options.targetPath,
+        });
         globalState_1.default.debug(`> Using profiles dir ${options.profilesDir} and profile ${options.profile || context.profileName}`);
         targetName = await (0, getDbtProfileTargetName_1.default)({
             isDbtCloudCLI: dbtVersion.isDbtCloudCLI,
@@ -117,6 +117,10 @@ const createProject = async (options) => {
         globalState_1.default.debug('> Creating project without warehouse credentials');
     }
     else {
+        const context = await (0, context_1.getDbtContext)({
+            projectDir: absoluteProjectPath,
+            targetPath: options.targetPath,
+        });
         globalState_1.default.debug(`> Using profiles dir ${options.profilesDir} and profile ${options.profile || context.profileName}`);
         targetName = await (0, getDbtProfileTargetName_1.default)({
             isDbtCloudCLI: dbtVersion.isDbtCloudCLI,

package/dist/handlers/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EACP,YAAY,EAOf,MAAM,mBAAmB,CAAC;AAiB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGlD,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,KAAK,UAAU,GAAG,oBAAoB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAkCF,eAAO,MAAM,MAAM,aACL,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,WAC3B,UAAU,KACpB,OAAO,CAAC,IAAI,CA2Cd,CAAC;AAyFF,eAAO,MAAM,aAAa,oBAA2B,oBAAoB,kBA+ExE,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EACP,YAAY,EAQf,MAAM,mBAAmB,CAAC;AAiB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGlD,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,KAAK,UAAU,GAAG,oBAAoB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAkCF,eAAO,MAAM,MAAM,aACL,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,WAC3B,UAAU,KACpB,OAAO,CAAC,IAAI,CA2Cd,CAAC;AA8FF,eAAO,MAAM,aAAa,oBAA2B,oBAAoB,kBA+ExE,CAAC"}

package/dist/handlers/deploy.js

@@ -70,15 +70,21 @@ exports.deploy = deploy;
 const createNewProject = async (executionId, options) => {
     console.error('');
     const absoluteProjectPath = path_1.default.resolve(options.projectDir);
-    const context = await (0, context_1.getDbtContext)({
-        projectDir: absoluteProjectPath,
-        targetPath: options.targetPath,
-    });
-    const dbtName = (0, common_1.friendlyName)(context.projectName);
-    // default project name
-    const defaultProjectName = dbtName;
-    let projectName = defaultProjectName;
+    let defaultProjectName = 'My new Lightdash Project'; // TODO: improve
+    try {
+        const context = await (0, context_1.getDbtContext)({
+            projectDir: absoluteProjectPath,
+            targetPath: options.targetPath,
+        });
+        defaultProjectName = (0, common_1.friendlyName)(context.projectName);
+    }
+    catch (e) {
+        if (e instanceof common_1.ParseError) {
+            // stick with default name
+        }
+    }
     // If interactive and no name provided, prompt for project name
+    let projectName = defaultProjectName;
     if (options.create === true && process.env.CI !== 'true') {
         const answers = await inquirer_1.default.prompt([
             {
@@ -102,7 +108,7 @@ const createNewProject = async (executionId, options) => {
         properties: {
             executionId,
             projectName,
-            isDefaultName: dbtName === projectName,
+            isDefaultName: defaultProjectName === projectName,
         },
     });
     try {

package/dist/handlers/lint/ajvToSarif.d.ts

@@ -8,7 +8,7 @@ type FileValidationResult = {
     errors: ErrorObject[];
     fileContent: string;
     locationMap?: LocationMap;
-    schemaType: 'chart' | 'dashboard';
+    schemaType: 'chart' | 'dashboard' | 'model';
 };
 export type SarifLog = {
     version: '2.1.0';

package/dist/handlers/lint/ajvToSarif.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ajvToSarif.d.ts","sourceRoot":"","sources":["../../../src/handlers/lint/ajvToSarif.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAEvC,KAAK,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjE,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,EAAE,OAAO,GAAG,WAAW,CAAC;CACrC,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE;QACF,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;SACvB,CAAC;KACL,CAAC;IACF,OAAO,EAAE,WAAW,EAAE,CAAC;CAC1B,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,EAAE,EAAE,MAAM,CAAC;IACX,gBAAgB,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,eAAe,CAAC,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,CAAC,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,OAAO,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,gBAAgB,EAAE;QACd,gBAAgB,EAAE;YACd,GAAG,EAAE,MAAM,CAAC;SACf,CAAC;QACF,MAAM,EAAE;YACJ,SAAS,EAAE,MAAM,CAAC;YAClB,WAAW,EAAE,MAAM,CAAC;SACvB,CAAC;KACL,CAAC;CACL,CAAC;AAmJF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAwG3E"}
+{"version":3,"file":"ajvToSarif.d.ts","sourceRoot":"","sources":["../../../src/handlers/lint/ajvToSarif.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAEvC,KAAK,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjE,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,EAAE,OAAO,GAAG,WAAW,GAAG,OAAO,CAAC;CAC/C,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE;QACF,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;SACvB,CAAC;KACL,CAAC;IACF,OAAO,EAAE,WAAW,EAAE,CAAC;CAC1B,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,EAAE,EAAE,MAAM,CAAC;IACX,gBAAgB,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,eAAe,CAAC,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,CAAC,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,OAAO,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,gBAAgB,EAAE;QACd,gBAAgB,EAAE;YACd,GAAG,EAAE,MAAM,CAAC;SACf,CAAC;QACF,MAAM,EAAE;YACJ,SAAS,EAAE,MAAM,CAAC;YAClB,WAAW,EAAE,MAAM,CAAC;SACvB,CAAC;KACL,CAAC;CACL,CAAC;AAmJF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAwG3E"}

package/dist/handlers/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/handlers/lint.ts"],"names":[],"mappings":"AAUA,KAAK,WAAW,GAAG;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B,CAAC;AAgNF,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGrE"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/handlers/lint.ts"],"names":[],"mappings":"AAcA,KAAK,WAAW,GAAG;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B,CAAC;AAsOF,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGrE"}

package/dist/handlers/lint.js

@@ -12,6 +12,7 @@ const ajvToSarif_1 = require("./lint/ajvToSarif");
 const sarifFormatter_1 = require("./lint/sarifFormatter");
 const validateChartSchema = ajv_1.ajv.compile(common_1.chartAsCodeSchema);
 const validateDashboardSchema = ajv_1.ajv.compile(common_1.dashboardAsCodeSchema);
+const validateModelSchema = ajv_1.ajv.compile(common_1.modelAsCodeSchema);
 /**
  * Find all YAML and JSON files in a path (file or directory).
  * If a file path is provided, returns it if it's a .yml/.yaml/.json file.
@@ -130,6 +131,23 @@ function validateFile(filePath) {
             };
         }
         const dataObj = data;
+        // Check if this is a model (has type: "model", "model/v1beta", or "model/v1")
+        if (dataObj.type === 'model' ||
+            dataObj.type === 'model/v1beta' ||
+            dataObj.type === 'model/v1') {
+            const valid = validateModelSchema(data);
+            if (!valid && validateModelSchema.errors) {
+                return {
+                    filePath,
+                    valid: false,
+                    errors: validateModelSchema.errors,
+                    fileContent,
+                    locationMap,
+                    type: 'model',
+                };
+            }
+            return { filePath, valid: true, type: 'model' };
+        }
         // Check if this is a chart (has version and metricQuery)
         if (dataObj.version === 1 && dataObj.metricQuery && !dataObj.tiles) {
             const valid = validateChartSchema(data);
@@ -199,7 +217,7 @@ async function lintHandler(options) {
     const results = [];
     for (const file of codeFiles) {
         const result = validateFile(file);
-        // Only track Lightdash Code files (views, explores, charts, dashboards)
+        // Only track Lightdash Code files (models, charts, dashboards)
         if (result.type) {
             results.push(result);
         }
@@ -207,7 +225,7 @@ async function lintHandler(options) {
     if (results.length === 0) {
         if (outputFormat === 'cli') {
             console.log(chalk_1.default.yellow('No Lightdash Code files found.'));
-            console.log(chalk_1.default.dim('Charts must have version: 1 + metricQuery, dashboards must have version: 1 + tiles'));
+            console.log(chalk_1.default.dim('Models must have type: model (or model/v1, model/v1beta), charts must have version: 1 + metricQuery, dashboards must have version: 1 + tiles'));
         }
         return;
     }

package/dist/index.js

@@ -114,7 +114,7 @@ ${styles.bold('Examples:')}
   ${styles.title('⚡')}️lightdash ${styles.bold('dbt run')} -s mymodel ${styles.secondary('-- runs a single model and generates .yml')}
   ${styles.title('⚡')}️lightdash ${styles.bold('dbt run')} -s model1 model2 ${styles.secondary('-- runs multiple models and generates .yml')}
   ${styles.title('⚡')}️lightdash ${styles.bold('dbt run')} -s tag:sales ${styles.secondary('-- runs all models tagged as "sales" and generates .yml')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('dbt run')} -s +mymodel ${styles.secondary("-- runs mymodel and its parents and generates .yml")}
+  ${styles.title('⚡')}️lightdash ${styles.bold('dbt run')} -s +mymodel ${styles.secondary('-- runs mymodel and its parents and generates .yml')}
 `)
     .option('--project-dir <path>', 'The directory of the dbt project', env_1.DEFAULT_DBT_PROJECT_DIR)
     .option('--profiles-dir <path>', 'The directory of the dbt profiles', env_1.DEFAULT_DBT_PROFILES_DIR)
@@ -376,7 +376,7 @@ ${styles.bold('Examples:')}
     .action(diagnostics_1.diagnosticsHandler);
 commander_1.program
     .command('lint')
-    .description('Validates Lightdash Code files (charts, dashboards) against JSON schemas')
+    .description('Validates Lightdash Code files (models, charts, dashboards) against JSON schemas')
     .addHelpText('after', `
 ${styles.bold('Examples:')}
   ${styles.title('⚡')}️lightdash ${styles.bold('lint')} ${styles.secondary('-- validates all Lightdash Code files in current directory')}

package/dist/lightdash/loader.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Loader for Lightdash YAML model files
+ */
+import { type LightdashModel } from '@lightdash/common';
+/**
+ * Load a single Lightdash YAML model file
+ */
+export declare function loadLightdashModel(filePath: string): Promise<LightdashModel>;
+/**
+ * Find all Lightdash YAML model files in a directory
+ * Looks for files in the lightdash/models directory
+ */
+export declare function findLightdashModelFiles(projectDir: string): Promise<string[]>;
+/**
+ * Load all Lightdash YAML models from a project directory
+ */
+export declare function loadLightdashModels(projectDir: string): Promise<LightdashModel[]>;
+//# sourceMappingURL=loader.d.ts.map

package/dist/lightdash/loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/lightdash/loader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMpE;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CA6BzB;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+BnB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC,CAwB3B"}

package/dist/lightdash/loader.js

@@ -0,0 +1,83 @@
+"use strict";
+/**
+ * Loader for Lightdash YAML model files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadLightdashModel = loadLightdashModel;
+exports.findLightdashModelFiles = findLightdashModelFiles;
+exports.loadLightdashModels = loadLightdashModels;
+const tslib_1 = require("tslib");
+const common_1 = require("@lightdash/common");
+const fs = tslib_1.__importStar(require("fs"));
+const yaml = tslib_1.__importStar(require("js-yaml"));
+const path = tslib_1.__importStar(require("path"));
+const globalState_1 = tslib_1.__importDefault(require("../globalState"));
+/**
+ * Load a single Lightdash YAML model file
+ */
+async function loadLightdashModel(filePath) {
+    try {
+        const fileContents = await fs.promises.readFile(filePath, 'utf8');
+        const parsed = yaml.load(fileContents);
+        // Basic validation
+        if (!parsed.type || !parsed.name || !parsed.dimensions) {
+            throw new common_1.ParseError(`Invalid Lightdash model in ${filePath}: must have type, name, and dimensions`);
+        }
+        if (!parsed.sql_from) {
+            throw new common_1.ParseError(`Invalid Lightdash model in ${filePath}: must have sql_from`);
+        }
+        return parsed;
+    }
+    catch (error) {
+        if (error instanceof common_1.ParseError) {
+            throw error;
+        }
+        throw new common_1.ParseError(`Failed to load Lightdash model from ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+/**
+ * Find all Lightdash YAML model files in a directory
+ * Looks for files in the lightdash/models directory
+ */
+async function findLightdashModelFiles(projectDir) {
+    const lightdashModelsDir = path.join(projectDir, 'lightdash', 'models');
+    if (!fs.existsSync(lightdashModelsDir)) {
+        globalState_1.default.debug(`No lightdash/models directory found at ${lightdashModelsDir}`);
+        return [];
+    }
+    const files = [];
+    async function walkDir(dir) {
+        const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+        for await (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                await walkDir(fullPath);
+            }
+            else if (entry.isFile() &&
+                (entry.name.endsWith('.yml') || entry.name.endsWith('.yaml'))) {
+                files.push(fullPath);
+            }
+        }
+    }
+    await walkDir(lightdashModelsDir);
+    return files;
+}
+/**
+ * Load all Lightdash YAML models from a project directory
+ */
+async function loadLightdashModels(projectDir) {
+    const modelFiles = await findLightdashModelFiles(projectDir);
+    globalState_1.default.debug(`Found ${modelFiles.length} Lightdash model files in ${projectDir}`);
+    const models = [];
+    for await (const filePath of modelFiles) {
+        try {
+            const model = await loadLightdashModel(filePath);
+            models.push(model);
+            globalState_1.default.debug(`Loaded Lightdash model: ${model.name}`);
+        }
+        catch (error) {
+            console.error(`Warning: Failed to load ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    return models;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2203.0",
+  "version": "0.2205.0",
   "license": "MIT",
   "bin": {
     "lightdash": "dist/index.js"
@@ -34,8 +34,8 @@
     "unique-names-generator": "^4.7.1",
     "uuid": "^11.0.3",
     "yaml": "^2.7.0",
-    "@lightdash/warehouses": "0.2203.0",
-    "@lightdash/common": "0.2203.0"
+    "@lightdash/common": "0.2205.0",
+    "@lightdash/warehouses": "0.2205.0"
   },
   "description": "Lightdash CLI tool",
   "devDependencies": {