@lightdash/cli 1.242.4 → 1.242.6

package/dist/handlers/contentAsCode/fileDiscovery.d.ts

@@ -0,0 +1,12 @@
+export type ContentFileType = 'chart' | 'dashboard';
+export type ContentFileClassification = {
+    kind: 'content';
+    contentType: ContentFileType;
+    supportedExtension: boolean;
+} | {
+    kind: 'loose';
+    supportedExtension: boolean;
+};
+export declare const classifyContentFilePath: (filePath: string, rootPath?: string) => ContentFileClassification | undefined;
+export declare const isSqlChartContent: (item: object) => boolean;
+//# sourceMappingURL=fileDiscovery.d.ts.map

package/dist/handlers/contentAsCode/fileDiscovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileDiscovery.d.ts","sourceRoot":"","sources":["../../../src/handlers/contentAsCode/fileDiscovery.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;AAEpD,MAAM,MAAM,yBAAyB,GAC/B;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,eAAe,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC/B,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,kBAAkB,EAAE,OAAO,CAAA;CAAE,CAAC;AAYrD,eAAO,MAAM,uBAAuB,aACtB,MAAM,aACL,MAAM,KAClB,yBAAyB,GAAG,SAyB9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,OACN,CAAC"}

package/dist/handlers/contentAsCode/fileDiscovery.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSqlChartContent = exports.classifyContentFilePath = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const isWithinRoot = (filePath, rootPath) => {
+    const relativePath = path.relative(rootPath, filePath);
+    return (relativePath === '' ||
+        (!relativePath.startsWith(`..${path.sep}`) &&
+            relativePath !== '..' &&
+            !path.isAbsolute(relativePath)));
+};
+const classifyContentFilePath = (filePath, rootPath) => {
+    if (rootPath && !isWithinRoot(filePath, rootPath))
+        return undefined;
+    const supportedExtension = filePath.endsWith('.yml');
+    if (!supportedExtension && !filePath.endsWith('.yaml'))
+        return undefined;
+    if (filePath.endsWith('.space.yml') ||
+        filePath.endsWith('.language.map.yml')) {
+        return undefined;
+    }
+    const parentFolder = path.basename(path.dirname(filePath));
+    if (parentFolder === 'charts') {
+        return { kind: 'content', contentType: 'chart', supportedExtension };
+    }
+    if (parentFolder === 'dashboards') {
+        return {
+            kind: 'content',
+            contentType: 'dashboard',
+            supportedExtension,
+        };
+    }
+    return { kind: 'loose', supportedExtension };
+};
+exports.classifyContentFilePath = classifyContentFilePath;
+const isSqlChartContent = (item) => 'sql' in item && !('tableName' in item);
+exports.isSqlChartContent = isSqlChartContent;

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

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/handlers/download.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/handlers/download.ts"],"names":[],"mappings":"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"}

package/dist/handlers/download.js

@@ -22,6 +22,7 @@ const appCodeFiles_1 = require("./apps/appCodeFiles");
 const appsDownload_1 = require("./apps/appsDownload");
 const scaffolding_1 = require("./apps/scaffolding");
 const uploadRetry_1 = require("./apps/uploadRetry");
+const fileDiscovery_1 = require("./contentAsCode/fileDiscovery");
 const projectResources_1 = require("./contentAsCode/projectResources");
 const resource_1 = require("./contentAsCode/resource");
 const contentAsCodePaths_1 = require("./contentAsCodePaths");
@@ -157,18 +158,20 @@ const hasUnsortedKeys = (obj) => {
     }
     return Object.values(obj).some(hasUnsortedKeys);
 };
-const isLightdashContentFile = (folder, entry) => entry.isFile() &&
-    entry.parentPath &&
-    entry.parentPath.endsWith(path.sep + folder) &&
-    entry.name.endsWith('.yml') &&
-    !entry.name.endsWith('.space.yml') &&
-    !entry.name.endsWith('.language.map.yml');
-const isLooseContentFile = (entry) => entry.isFile() &&
-    entry.parentPath &&
-    !entry.parentPath.endsWith(`${path.sep}charts`) &&
-    !entry.parentPath.endsWith(`${path.sep}dashboards`) &&
-    entry.name.endsWith('.yml') &&
-    !entry.name.endsWith('.language.map.yml');
+const isLightdashContentFile = (folder, entry) => {
+    if (!entry.isFile() || !entry.parentPath)
+        return false;
+    const classification = (0, fileDiscovery_1.classifyContentFilePath)(path.join(entry.parentPath, entry.name));
+    return (classification?.kind === 'content' &&
+        classification.supportedExtension &&
+        `${classification.contentType}s` === folder);
+};
+const isLooseContentFile = (entry) => {
+    if (!entry.isFile() || !entry.parentPath)
+        return false;
+    const classification = (0, fileDiscovery_1.classifyContentFilePath)(path.join(entry.parentPath, entry.name));
+    return (classification?.kind === 'loose' && classification.supportedExtension);
+};
 const processYamlItem = (item, fileName, stats, folder, metadata) => {
     if (hasUnsortedKeys(item)) {
         globalState_1.default.log(styles.warning(`Warning: ${fileName} has unsorted YAML keys. Re-download to fix, or sort keys alphabetically.`));
@@ -1482,8 +1485,6 @@ const runUploadChangesPhase = async ({ output, label, changes, action, onCount,
     onCount?.(countChangeDelta(before, updatedChanges));
     return updatedChanges;
 };
-// SQL charts have 'sql' field instead of 'tableName'/'metricQuery'
-const isSqlChart = (item) => 'sql' in item && !('tableName' in item);
 const upsertSingleItem = async (item, type, projectId, changes, force, config, skipSpaceCreate, publicSpaceCreate, validate, spaceNames) => {
     try {
         if (!force && !item.needsUpdating) {
@@ -1493,7 +1494,7 @@ const upsertSingleItem = async (item, type, projectId, changes, force, config, s
         }
         globalState_1.default.debug(`Upserting ${type} ${item.slug}`);
         // SQL charts use a different endpoint
-        const isSqlChartItem = type === 'charts' && isSqlChart(item);
+        const isSqlChartItem = type === 'charts' && (0, fileDiscovery_1.isSqlChartContent)(item);
         const endpoint = isSqlChartItem
             ? `/api/v1/projects/${projectId}/code/sqlCharts/${item.slug}`
             : `/api/v1/projects/${projectId}/code/${type}/${item.slug}`;

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

@@ -1 +1 @@
-{"version":3,"file":"sarifFormatter.d.ts","sourceRoot":"","sources":["../../../src/handlers/lint/sarifFormatter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAC;AAgC1D;;GAEG;AACH,wBAAgB,iBAAiB,CAC7B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,GACnB,MAAM,CAoFR;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACtB,CA4BA"}
+{"version":3,"file":"sarifFormatter.d.ts","sourceRoot":"","sources":["../../../src/handlers/lint/sarifFormatter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAC;AAgC1D;;GAEG;AACH,wBAAgB,iBAAiB,CAC7B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,GACnB,MAAM,CAqFR;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACtB,CA4BA"}

package/dist/handlers/lint/sarifFormatter.js

@@ -59,7 +59,7 @@ function formatSarifForCli(sarifLog, searchPath) {
         }
         output.push(color(`\n${sectionLabel}\n`));
         for (const [fileUri, fileResults] of byFile.entries()) {
-            const relativePath = path.relative(searchPath, fileUri);
+            const relativePath = path.relative(searchPath, fileUri) || path.basename(fileUri);
             output.push(boldColor(`\n${marker} ${relativePath}`));
             for (const result of fileResults) {
                 const message = result.message.text;

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

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/handlers/lint.ts"],"names":[],"mappings":"AAiBA,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,CAuJrE"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/handlers/lint.ts"],"names":[],"mappings":"AA2BA,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;AA4aF,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA6JrE"}

package/dist/handlers/lint.js

@@ -5,11 +5,14 @@ const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs = tslib_1.__importStar(require("fs"));
+const yaml = tslib_1.__importStar(require("js-yaml"));
 const path = tslib_1.__importStar(require("path"));
 const uuid_1 = require("uuid");
 const YAML = tslib_1.__importStar(require("yaml"));
 const ajv_1 = require("../ajv");
 const analytics_1 = require("../analytics/analytics");
+const fileDiscovery_1 = require("./contentAsCode/fileDiscovery");
+const contentAsCodePaths_1 = require("./contentAsCodePaths");
 const ajvToSarif_1 = require("./lint/ajvToSarif");
 const sarifFormatter_1 = require("./lint/sarifFormatter");
 const validateChartSchema = ajv_1.ajv.compile(common_1.chartAsCodeSchema);
@@ -80,8 +83,14 @@ function buildLocationMap(fileContent, isJson) {
         const data = JSON.parse(fileContent);
         return { data, locationMap };
     }
-    // Parse YAML with the 'yaml' package to access the Abstract Syntax Tree (AST)
-    const doc = YAML.parseDocument(fileContent);
+    // Match upload parsing, then normalize the value as it will be serialized
+    // into the upload request. Use `yaml` separately for source locations.
+    const parsedData = yaml.load(fileContent);
+    const serializedData = JSON.stringify(parsedData);
+    const data = serializedData === undefined
+        ? parsedData
+        : JSON.parse(serializedData);
+    const doc = YAML.parseDocument(fileContent, { merge: true });
     function traverse(node, jsonPath) {
         if (!node)
             return;
@@ -111,89 +120,210 @@ function buildLocationMap(fileContent, isJson) {
             }
         }
     }
-    traverse(doc.contents, '');
-    // Convert to plain JS object for validation
-    const data = doc.toJS();
+    if (doc.errors.length === 0) {
+        traverse(doc.contents, '');
+    }
     return { data, locationMap };
 }
-/**
- * Validate a single YAML or JSON file
- */
-function validateFile(filePath) {
+function validateAsCodeSchema({ data, fileContent, filePath, locationMap, type, }) {
+    let validate;
+    switch (type) {
+        case 'chart':
+            validate = validateChartSchema;
+            break;
+        case 'dashboard':
+            validate = validateDashboardSchema;
+            break;
+        case 'model':
+            validate = validateModelSchema;
+            break;
+        default:
+            return (0, common_1.assertUnreachable)(type, `Unknown Lightdash Code type: ${type}`);
+    }
+    const valid = validate(data);
+    if (!valid && validate.errors) {
+        return {
+            filePath,
+            valid: false,
+            errors: validate.errors,
+            fileContent,
+            locationMap,
+            type,
+        };
+    }
+    return { filePath, valid: true, type };
+}
+function createErrorResult({ error, fileContent, filePath, locationMap, type, }) {
+    return {
+        filePath,
+        valid: false,
+        errors: [error],
+        fileContent,
+        locationMap,
+        type,
+    };
+}
+function getUploadType(classification, data) {
+    if (classification?.kind === 'content') {
+        return classification.contentType;
+    }
+    if (classification?.kind !== 'loose')
+        return undefined;
+    if (data?.contentType === common_1.ContentAsCodeType.CHART ||
+        data?.contentType === common_1.ContentAsCodeType.SQL_CHART) {
+        return 'chart';
+    }
+    if (data?.contentType === common_1.ContentAsCodeType.DASHBOARD) {
+        return 'dashboard';
+    }
+    return undefined;
+}
+function getModelCodeType(data) {
+    if (data?.type === 'model' ||
+        data?.type === 'model/v1beta' ||
+        data?.type === 'model/v1') {
+        return 'model';
+    }
+    return undefined;
+}
+function getPartialYamlData(fileContent) {
+    try {
+        const doc = YAML.parseDocument(fileContent, { merge: true });
+        const data = doc.toJS();
+        return data && typeof data === 'object' && !Array.isArray(data)
+            ? data
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function getParseErrorLocation(error) {
+    if (!error || typeof error !== 'object')
+        return undefined;
+    const linePos = Reflect.get(error, 'linePos');
+    if (Array.isArray(linePos)) {
+        const firstPosition = linePos[0];
+        if (typeof firstPosition?.line === 'number' &&
+            typeof firstPosition.col === 'number') {
+            return { line: firstPosition.line, column: firstPosition.col };
+        }
+    }
+    const mark = Reflect.get(error, 'mark');
+    if (typeof mark?.line === 'number' && typeof mark.column === 'number') {
+        return { line: mark.line + 1, column: mark.column + 1 };
+    }
+    return undefined;
+}
+function createUnsupportedExtensionResult(filePath, fileContent, type) {
+    return createErrorResult({
+        filePath,
+        fileContent,
+        type,
+        error: {
+            keyword: 'extension',
+            instancePath: '',
+            schemaPath: '',
+            params: { allowedExtension: '.yml' },
+            message: "Content files must use the '.yml' extension",
+        },
+    });
+}
+function validateFile(filePath, contentRoot) {
+    const classification = (0, fileDiscovery_1.classifyContentFilePath)(filePath, contentRoot);
+    let fileContent;
     try {
-        // Read and parse file
-        const fileContent = fs.readFileSync(filePath, 'utf8');
+        fileContent = fs.readFileSync(filePath, 'utf8');
         const isJson = filePath.endsWith('.json');
         const { data, locationMap } = buildLocationMap(fileContent, isJson);
-        if (!data || typeof data !== 'object') {
-            return {
-                filePath,
-                valid: false,
-                // Skip non-object files as they're not lightdash code
-            };
+        const dataObj = data && typeof data === 'object' && !Array.isArray(data)
+            ? data
+            : undefined;
+        const uploadType = getUploadType(classification, dataObj);
+        if (uploadType && classification?.supportedExtension === false) {
+            return createUnsupportedExtensionResult(filePath, fileContent, uploadType);
         }
-        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 {
+        if (!dataObj) {
+            return uploadType
+                ? createErrorResult({
                     filePath,
-                    valid: false,
-                    errors: validateModelSchema.errors,
                     fileContent,
                     locationMap,
-                    type: 'model',
-                };
-            }
-            return { filePath, valid: true, type: 'model' };
+                    type: uploadType,
+                    error: {
+                        keyword: 'type',
+                        instancePath: '',
+                        schemaPath: '#/type',
+                        params: { type: 'object' },
+                        message: 'must be object',
+                    },
+                })
+                : { filePath, valid: true };
         }
-        // Check if this is a chart (has version and metricQuery)
-        if (dataObj.version === 1 && dataObj.metricQuery && !dataObj.tiles) {
-            const valid = validateChartSchema(data);
-            if (!valid && validateChartSchema.errors) {
-                return {
-                    filePath,
-                    valid: false,
-                    errors: validateChartSchema.errors,
-                    fileContent,
-                    locationMap,
-                    type: 'chart',
-                };
+        if (uploadType) {
+            if (uploadType === 'chart' && (0, fileDiscovery_1.isSqlChartContent)(dataObj)) {
+                return { filePath, valid: true, type: 'chart' };
             }
-            return { filePath, valid: true, type: 'chart' };
+            return validateAsCodeSchema({
+                data,
+                fileContent,
+                filePath,
+                locationMap,
+                type: uploadType,
+            });
         }
-        // Check if this is a dashboard (has version and tiles)
-        if (dataObj.version === 1 && dataObj.tiles) {
-            const valid = validateDashboardSchema(data);
-            if (!valid && validateDashboardSchema.errors) {
-                return {
-                    filePath,
-                    valid: false,
-                    errors: validateDashboardSchema.errors,
-                    fileContent,
-                    locationMap,
-                    type: 'dashboard',
-                };
-            }
-            return { filePath, valid: true, type: 'dashboard' };
+        const modelType = getModelCodeType(dataObj);
+        if (modelType) {
+            return validateAsCodeSchema({
+                data,
+                fileContent,
+                filePath,
+                locationMap,
+                type: modelType,
+            });
         }
-        // Not a lightdash code file
-        return {
-            filePath,
-            valid: true, // Don't report non-lightdash files as errors
-        };
+        return { filePath, valid: true };
     }
     catch (error) {
-        // Parsing error - skip this file
-        return {
+        const partialData = fileContent
+            ? getPartialYamlData(fileContent)
+            : undefined;
+        const uploadType = getUploadType(classification, partialData);
+        const type = uploadType ?? getModelCodeType(partialData);
+        if (!type)
+            return { filePath, valid: true };
+        if (uploadType && classification?.supportedExtension === false) {
+            return createUnsupportedExtensionResult(filePath, fileContent ?? '', uploadType);
+        }
+        const parseLocation = getParseErrorLocation(error);
+        const locationMap = parseLocation
+            ? new Map([['/', parseLocation]])
+            : undefined;
+        return createErrorResult({
             filePath,
-            valid: false,
-        };
+            fileContent: fileContent ?? '',
+            locationMap,
+            type,
+            error: {
+                keyword: 'parse',
+                instancePath: '',
+                schemaPath: '',
+                params: {},
+                message: (0, common_1.getErrorMessage)(error),
+            },
+        });
     }
 }
+function getDefaultContentRoot(searchPath) {
+    const contentRootMarkers = [
+        '.lightdash-metadata.json',
+        'charts',
+        'dashboards',
+    ];
+    return contentRootMarkers.some((marker) => fs.existsSync(path.join(searchPath, marker)))
+        ? searchPath
+        : (0, contentAsCodePaths_1.getDownloadFolder)();
+}
 async function lintHandler(options) {
     const executionId = (0, uuid_1.v4)();
     const startTime = Date.now();
@@ -205,6 +335,12 @@ async function lintHandler(options) {
         if (!fs.existsSync(searchPath)) {
             throw new Error(`Path does not exist: ${searchPath}`);
         }
+        let contentRoot = getDefaultContentRoot(searchPath);
+        if (options.path) {
+            contentRoot = fs.statSync(searchPath).isFile()
+                ? path.dirname(searchPath)
+                : searchPath;
+        }
         if (outputFormat === 'cli') {
             console.log(chalk_1.default.dim(`Searching for Lightdash Code files in: ${searchPath}\n`));
         }
@@ -222,7 +358,7 @@ async function lintHandler(options) {
             }
             // Validate each file
             for (const file of codeFiles) {
-                const result = validateFile(file);
+                const result = validateFile(file, contentRoot);
                 // Only track Lightdash Code files (models, charts, dashboards)
                 if (result.type) {
                     results.push(result);
@@ -231,13 +367,13 @@ 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('Models must have type: model (or model/v1, model/v1beta), 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 and dashboards must be in their matching folder or declare contentType.'));
                 }
             }
             else {
                 // Build SARIF report from all results that produced schema errors.
                 const sarifResults = results
-                    .filter((r) => r.fileContent &&
+                    .filter((r) => r.fileContent !== undefined &&
                     r.type &&
                     r.errors &&
                     r.errors.length > 0)

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=lint.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lint.test.d.ts","sourceRoot":"","sources":["../../src/handlers/lint.test.ts"],"names":[],"mappings":""}