@lightdash/cli 0.2659.0 → 0.2661.2

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

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/handlers/download.ts"],"names":[],"mappings":"AA2CA,MAAM,MAAM,sBAAsB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AA2FF,KAAK,aAAa,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAyOF,KAAK,mBAAmB,GAAG,QAAQ,GAAG,YAAY,GAAG,WAAW,CAAC;AAkDjE,eAAO,MAAM,eAAe,GACxB,KAAK,MAAM,EAAE,EACb,MAAM,mBAAmB,EACzB,WAAW,MAAM,EACjB,aAAa,MAAM,EACnB,aAAa,MAAM,EACnB,cAAa,OAAe,EAC5B,SAAQ,OAAe,KACxB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,CAAC,CA+G7C,CAAC;AAEF,eAAO,MAAM,eAAe,GACxB,SAAS,sBAAsB,KAChC,OAAO,CAAC,IAAI,CAsMd,CAAC;AA4ZF,eAAO,MAAM,aAAa,GACtB,SAAS,sBAAsB,KAChC,OAAO,CAAC,IAAI,CAkJd,CAAC"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/handlers/download.ts"],"names":[],"mappings":"AA4CA,MAAM,MAAM,sBAAsB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AA2FF,KAAK,aAAa,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAoVF,KAAK,mBAAmB,GAAG,QAAQ,GAAG,YAAY,GAAG,WAAW,CAAC;AAkDjE,eAAO,MAAM,eAAe,GACxB,KAAK,MAAM,EAAE,EACb,MAAM,mBAAmB,EACzB,WAAW,MAAM,EACjB,aAAa,MAAM,EACnB,aAAa,MAAM,EACnB,cAAa,OAAe,EAC5B,SAAQ,OAAe,KACxB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,CAAC,CA+G7C,CAAC;AAEF,eAAO,MAAM,eAAe,GACxB,SAAS,sBAAsB,KAChC,OAAO,CAAC,IAAI,CAsMd,CAAC;AAgbF,eAAO,MAAM,aAAa,GACtB,SAAS,sBAAsB,KAChC,OAAO,CAAC,IAAI,CAiKd,CAAC"}

package/dist/handlers/download.js

@@ -119,15 +119,15 @@ const isLightdashContentFile = (folder, entry) => entry.isFile() &&
     entry.parentPath.endsWith(path.sep + folder) &&
     entry.name.endsWith('.yml') &&
     !entry.name.endsWith('.language.map.yml');
-const loadYamlFile = async (file, folder, metadata) => {
-    const filePath = path.join(file.parentPath, file.name);
-    const [fileContent, stats] = await Promise.all([
-        fs_1.promises.readFile(filePath, 'utf-8'),
-        fs_1.promises.stat(filePath),
-    ]);
-    const item = yaml.load(fileContent);
+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 processYamlItem = (item, fileName, stats, folder, metadata) => {
     if (hasUnsortedKeys(item)) {
-        globalState_1.default.log(styles.warning(`Warning: ${file.name} has unsorted YAML keys. Re-download to fix, or sort keys alphabetically.`));
+        globalState_1.default.log(styles.warning(`Warning: ${fileName} has unsorted YAML keys. Re-download to fix, or sort keys alphabetically.`));
     }
     const metadataSection = folder === 'dashboards' ? metadata.dashboards : metadata.charts;
     const downloadedAtRaw = metadataSection[item.slug] ?? item.downloadedAt;
@@ -144,6 +144,15 @@ const loadYamlFile = async (file, folder, metadata) => {
         needsUpdating: needsUpdating ?? true,
     };
 };
+const loadYamlFile = async (file, folder, metadata) => {
+    const filePath = path.join(file.parentPath, file.name);
+    const [fileContent, stats] = await Promise.all([
+        fs_1.promises.readFile(filePath, 'utf-8'),
+        fs_1.promises.stat(filePath),
+    ]);
+    const item = yaml.load(fileContent);
+    return processYamlItem(item, file.name, stats, folder, metadata);
+};
 const readCodeFiles = async (folder, customPath) => {
     const baseDir = getDownloadFolder(customPath);
     globalState_1.default.log(`Reading ${folder} from ${baseDir}`);
@@ -176,6 +185,55 @@ const readCodeFiles = async (folder, customPath) => {
         throw error;
     }
 };
+/**
+ * Reads YAML files outside the standard charts/ and dashboards/ directories
+ * and classifies them by their contentType field.
+ */
+const readLooseCodeFiles = async (customPath) => {
+    const baseDir = getDownloadFolder(customPath);
+    const charts = [];
+    const dashboards = [];
+    try {
+        const metadata = await (0, metadataFile_1.readMetadataFile)(baseDir);
+        const allEntries = await fs_1.promises.readdir(baseDir, {
+            recursive: true,
+            withFileTypes: true,
+        });
+        const looseFiles = allEntries.filter(isLooseContentFile);
+        await Promise.all(looseFiles.map(async (file) => {
+            try {
+                const filePath = path.join(file.parentPath, file.name);
+                const [fileContent, stats] = await Promise.all([
+                    fs_1.promises.readFile(filePath, 'utf-8'),
+                    fs_1.promises.stat(filePath),
+                ]);
+                const parsed = yaml.load(fileContent);
+                const contentType = parsed?.contentType;
+                if (contentType === common_1.ContentAsCodeType.CHART ||
+                    contentType === common_1.ContentAsCodeType.SQL_CHART) {
+                    charts.push(processYamlItem(parsed, file.name, stats, 'charts', metadata));
+                }
+                else if (contentType === common_1.ContentAsCodeType.DASHBOARD) {
+                    dashboards.push(processYamlItem(parsed, file.name, stats, 'dashboards', metadata));
+                }
+                else {
+                    globalState_1.default.debug(`Skipping ${file.name}: no recognized contentType`);
+                }
+            }
+            catch (e) {
+                globalState_1.default.debug(`Skipping ${file.name}: failed to parse (${(0, common_1.getErrorMessage)(e)})`);
+            }
+        }));
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            // Base directory doesn't exist — nothing to discover
+            return { charts, dashboards };
+        }
+        throw error;
+    }
+    return { charts, dashboards };
+};
 const groupBySpace = (items) => {
     const itemsWithIndex = items.map((item, index) => ({ item, index }));
     return (0, groupBy_1.default)(itemsWithIndex, (entry) => entry.item.spaceSlug);
@@ -521,6 +579,16 @@ const upsertSingleItem = async (item, type, projectId, changes, force, config, s
         Object.keys(updatedChanges).forEach((key) => {
             changes[key] = updatedChanges[key];
         });
+        // Warn if contentType contradicts the folder this item came from
+        const itemContentType = item.contentType;
+        if (itemContentType) {
+            const expectedType = itemContentType === common_1.ContentAsCodeType.DASHBOARD
+                ? 'dashboards'
+                : 'charts';
+            if (expectedType !== type) {
+                globalState_1.default.log(styles.warning(`Warning: "${item.name}" has contentType "${itemContentType}" but is in the ${type}/ directory. It will be uploaded as a ${type.slice(0, -1)}.`));
+            }
+        }
         // Run validation if requested
         if (validate && !isSqlChartItem) {
             const contentUuid = type === 'charts'
@@ -581,9 +649,10 @@ const upsertSingleItem = async (item, type, projectId, changes, force, config, s
  *
  * @param slugs if slugs are provided, we only force upsert the charts/dashboards that match the slugs, if slugs are empty, we upload files that were locally updated
  */
-const upsertResources = async (type, projectId, changes, force, slugs, customPath, skipSpaceCreate, publicSpaceCreate, validate, concurrency = 1) => {
+const upsertResources = async (type, projectId, changes, force, slugs, customPath, skipSpaceCreate, publicSpaceCreate, validate, concurrency = 1, extraItems = []) => {
     const config = await (0, config_1.getConfig)();
-    const items = await readCodeFiles(type, customPath);
+    const folderItems = await readCodeFiles(type, customPath);
+    const items = [...folderItems, ...extraItems];
     globalState_1.default.log(`Found ${items.length} ${type} files`);
     const hasFilter = slugs.length > 0;
     const filteredItems = hasFilter
@@ -724,11 +793,19 @@ const uploadHandler = async (options) => {
         if (parseInt(String(options.concurrency), 10) > 1000) {
             globalState_1.default.log(styles.warning(`Concurrency limit exceeded. Using maximum of 1000 instead of ${options.concurrency}`));
         }
+        // Discover loose YAML files (outside charts/ and dashboards/) classified by contentType
+        const looseFiles = await readLooseCodeFiles(options.path);
+        if (looseFiles.charts.length > 0) {
+            globalState_1.default.log(`Found ${looseFiles.charts.length} chart(s) outside charts/ directory (classified by contentType)`);
+        }
+        if (looseFiles.dashboards.length > 0) {
+            globalState_1.default.log(`Found ${looseFiles.dashboards.length} dashboard(s) outside dashboards/ directory (classified by contentType)`);
+        }
         if (hasFilters && chartSlugs.length === 0) {
             globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
         }
         else {
-            const { changes: chartChanges, total } = await upsertResources('charts', projectId, changes, options.force, chartSlugs, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency);
+            const { changes: chartChanges, total } = await upsertResources('charts', projectId, changes, options.force, chartSlugs, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.charts);
             changes = chartChanges;
             chartTotal = total;
         }
@@ -736,7 +813,7 @@ const uploadHandler = async (options) => {
             globalState_1.default.log(styles.warning(`No dashboard filters provided, skipping`));
         }
         else {
-            const { changes: dashboardChanges, total } = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency);
+            const { changes: dashboardChanges, total } = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.dashboards);
             changes = dashboardChanges;
             dashboardTotal = total;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2659.0",
+  "version": "0.2661.2",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -40,8 +40,8 @@
     "unique-names-generator": "^4.7.1",
     "uuid": "^11.0.3",
     "yaml": "^2.7.0",
-    "@lightdash/common": "0.2659.0",
-    "@lightdash/warehouses": "0.2659.0"
+    "@lightdash/common": "0.2661.2",
+    "@lightdash/warehouses": "0.2661.2"
   },
   "devDependencies": {
     "@types/inquirer": "^8.2.1",