@lightdash/cli 2.174.0 → 2.175.0

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

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,OAAO,EACP,YAAY,EAkBf,MAAM,mBAAmB,CAAC;AAqB3B,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAsB9E,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;IAC/B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,QAAQ,EAAE,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,YACvB,OAAO,GAAG,YAAY,KAChC,OAIW,CAAC;AAEf,eAAO,MAAM,0BAA0B,YAC1B,OAAO,GAAG,YAAY,KAChC,OAAO,GAAG,YAiBZ,CAAC;AA6TF,eAAO,MAAM,cAAc,YACd,qBAAqB,KAC/B,OAAO,CAAC,oBAAoB,CA2a9B,CAAC;AAEF,eAAO,MAAM,OAAO,YACP,qBAAqB,KAC/B,OAAO,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CACO,CAAC;AAE7C,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAmCzC,CAAC"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,OAAO,EACP,YAAY,EAkBf,MAAM,mBAAmB,CAAC;AAqB3B,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAsB9E,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;IAC/B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,QAAQ,EAAE,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,YACvB,OAAO,GAAG,YAAY,KAChC,OAIW,CAAC;AAEf,eAAO,MAAM,0BAA0B,YAC1B,OAAO,GAAG,YAAY,KAChC,OAAO,GAAG,YAiBZ,CAAC;AAgTF,eAAO,MAAM,cAAc,YACd,qBAAqB,KAC/B,OAAO,CAAC,oBAAoB,CA2a9B,CAAC;AAEF,eAAO,MAAM,OAAO,YACP,qBAAqB,KAC/B,OAAO,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CACO,CAAC;AAE7C,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAmCzC,CAAC"}

package/dist/handlers/compile.js

@@ -133,14 +133,11 @@ const getExploresFromLightdashYmlProject = async ({ projectDir, lightdashProject
     }
     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, {
+    const validExplores = await (0, common_1.compileLightdashModels)({
+        models: lightdashModels,
+        warehouseSqlBuilder,
+        lightdashProjectConfig,
         disableTimestampConversion,
         allowPartialCompilation,
         postProcessors: [common_1.preAggregatePostProcessor],

package/dist/handlers/compile.test.js

@@ -116,7 +116,7 @@ dimensions:
     });
     test('should allow partial compilation by default and allow it to be disabled explicitly', async () => {
         vi.spyOn(lightdashLoader, 'loadLightdashModels').mockResolvedValue([
-            modelWithBrokenMetric,
+            { ...modelWithBrokenMetric, sourcePath: 'models/test_model.yml' },
         ]);
         const errorOutput = [];
         vi.spyOn(console, 'error').mockImplementation((...args) => {
@@ -144,4 +144,8 @@ dimensions:
             expect.stringContaining('Compiled 1 explores, SUCCESS=0 ERRORS=1'),
         ]));
     });
+    test('rejects malformed native YAML instead of compiling only the valid models', async () => {
+        await promises_1.default.writeFile(path.join(tempDir, 'lightdash/models/broken.yml'), 'type: model\ndimensions: [');
+        await expect((0, compile_1.compile)(getCompileOptions(tempDir))).rejects.toThrow(/broken.yml/);
+    });
 });

package/dist/handlers/compileProject.test.js

@@ -10,6 +10,7 @@ const context_1 = require("../dbt/context");
 const manifest_1 = require("../dbt/manifest");
 const validation_1 = require("../dbt/validation");
 const loader_1 = require("../lightdash/loader");
+const projectType_1 = require("../lightdash/projectType");
 const compile_1 = require("./compile");
 const apiClient_1 = require("./dbt/apiClient");
 const compile_2 = require("./dbt/compile");
@@ -138,6 +139,36 @@ describe('compileProject completeness', () => {
         vi.restoreAllMocks();
         await promises_1.default.rm(tempDir, { recursive: true, force: true });
     });
+    test.each([false, true])('compiles dbt when ignored YAML is malformed, symlinked models: %s', async (symlinkedModels) => {
+        const projectDir = path_1.default.join(tempDir, 'dbt-project');
+        const modelsDir = symlinkedModels
+            ? path_1.default.join(tempDir, 'shared-models')
+            : path_1.default.join(projectDir, 'models');
+        await promises_1.default.mkdir(projectDir);
+        await promises_1.default.mkdir(modelsDir);
+        if (symlinkedModels)
+            await promises_1.default.symlink(modelsDir, path_1.default.join(projectDir, 'models'));
+        await promises_1.default.writeFile(path_1.default.join(projectDir, 'dbt_project.yml'), 'name: test_project\nversion: "1.0"\nconfig-version: 2\n');
+        await promises_1.default.writeFile(path_1.default.join(projectDir, '.dbtignore'), 'models/archived.yml\n');
+        await promises_1.default.writeFile(path_1.default.join(modelsDir, 'schema.yml'), 'version: 2\nmodels:\n  - name: orders\n');
+        await promises_1.default.writeFile(path_1.default.join(modelsDir, 'archived.yml'), 'archived: [unfinished\n');
+        const loader = await vi.importActual('../lightdash/loader');
+        vi.mocked(loader_1.findLightdashModelFiles).mockImplementationOnce(loader.findLightdashModelFiles);
+        vi.mocked(loader_1.loadLightdashModels).mockImplementationOnce(loader.loadLightdashModels);
+        vi.mocked(manifest_1.loadManifest).mockResolvedValue(manifest({
+            'model.test.orders': dbtNode('model.test.orders', 'model', true),
+        }));
+        vi.mocked(compile_2.maybeCompileModelsAndJoins).mockResolvedValue({
+            compiledModelIds: ['model.test.orders'],
+            originallySelectedModelIds: undefined,
+        });
+        await expect((0, projectType_1.detectProjectType)({ projectDir })).resolves.toMatchObject({ type: projectType_1.CliProjectType.Dbt });
+        const result = await (0, compile_1.compileProject)(compileOptions(projectDir));
+        expect(result.explores.map((explore) => explore.name)).toEqual([
+            'orders',
+        ]);
+        expect(compile_2.maybeCompileModelsAndJoins).toHaveBeenCalled();
+    });
     test('reports an unselected model and seed manifest as complete', async () => {
         const projectManifest = manifest({
             'model.test.orders': dbtNode('model.test.orders', 'model', true),

package/dist/handlers/compileWarehouseColumnValidation.test.js

@@ -454,7 +454,7 @@ describe('compile warehouse column validation', () => {
     describe('lightdash yml projects', () => {
         beforeEach(async () => {
             vi.mocked(loader_1.loadLightdashModels).mockResolvedValue([
-                lightdashYmlModel,
+                { ...lightdashYmlModel, sourcePath: 'models/test_model.yml' },
             ]);
             await promises_1.default.writeFile(path.join(tempDir, 'lightdash.config.yml'), 'warehouse:\n  type: postgres\n');
         });

package/dist/lightdash/loader.d.ts

@@ -1,11 +1,5 @@
-/**
- * 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>;
+import { type LightdashModelWithSource } from '@lightdash/common';
+export { loadLightdashModel } from '@lightdash/common/lightdash/loader';
 /**
  * Find all Lightdash YAML model files in a directory
  * Looks for files in models/ or lightdash/models/ directory that contain `type: model`
@@ -14,8 +8,5 @@ export declare function loadLightdashModel(filePath: string): Promise<LightdashM
  * to avoid false positives from other YAML files (e.g., content-as-code spaces).
  */
 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[]>;
+export declare function loadLightdashModels(projectDir: string): Promise<LightdashModelWithSource[]>;
 //# sourceMappingURL=loader.d.ts.map

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

@@ -1 +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;AAuBD;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CACzC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CAqDnB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC,CAwB3B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/lightdash/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAOlE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAoBxE;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CACzC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CAqDnB;AAED,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAGrC"}

package/dist/lightdash/loader.js

@@ -1,44 +1,17 @@
 "use strict";
-/**
- * Loader for Lightdash YAML model files
- */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadLightdashModel = loadLightdashModel;
+exports.loadLightdashModel = void 0;
 exports.findLightdashModelFiles = findLightdashModelFiles;
 exports.loadLightdashModels = loadLightdashModels;
 const tslib_1 = require("tslib");
-const common_1 = require("@lightdash/common");
+const loader_1 = require("@lightdash/common/lightdash/loader");
 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)}`);
-    }
-}
-/**
- * Check if a YAML file contains a Lightdash model definition
- * A valid model file must have a `type` field with value 'model', 'model/v1beta', or 'model/v1'
- */
+var loader_2 = require("@lightdash/common/lightdash/loader");
+Object.defineProperty(exports, "loadLightdashModel", { enumerable: true, get: function () { return loader_2.loadLightdashModel; } });
+// Format detection must tolerate files that dbt may ignore or handle itself.
 async function isLightdashModelFile(filePath) {
     try {
         const fileContents = await fs.promises.readFile(filePath, 'utf8');
@@ -101,22 +74,8 @@ async function findLightdashModelFiles(projectDir) {
     }
     return modelFiles;
 }
-/**
- * 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;
+    if ((await findLightdashModelFiles(projectDir)).length === 0)
+        return [];
+    return (0, loader_1.loadLightdashModels)(projectDir);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "2.174.0",
+  "version": "2.175.0",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -45,8 +45,8 @@
     "unique-names-generator": "4.7.1",
     "uuid": "11.1.1",
     "yaml": "2.8.3",
-    "@lightdash/common": "2.174.0",
-    "@lightdash/warehouses": "2.174.0"
+    "@lightdash/common": "2.175.0",
+    "@lightdash/warehouses": "2.175.0"
   },
   "devDependencies": {
     "@types/inquirer": "8.2.4",